[evolution] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit 1dcbae5b7c0c9b9a991e577397b01dc9bdacb16e
Author: Sira Nokyoongtong <gumaraa gmail com>
Date:   Sun Jun 6 17:08:30 2010 +0700

    Updated Thai translation.

 po/th.po | 9949 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 5012 insertions(+), 4937 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index aa40dde..2c869ac 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,15 +9,15 @@
 # messages like "Every day" and "Every %d days", which will sound better
 # if translated differently.
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:504
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-04-21 06:35+0000\n"
-"PO-Revision-Date: 2010-04-21 13:44+0700\n"
-"Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
+"POT-Creation-Date: 2010-06-04 12:35+0000\n"
+"PO-Revision-Date: 2010-06-06 16:45+0700\n"
+"Last-Translator: Sira Nokyoongtong <gumaraa gmail com>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,41 +87,46 @@ msgid "Delete address book '{0}'?"
 msgstr "ล�สมุ��ี�อยู� '{0}' หรือ�ม�?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "�_ม�ล�"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "��ิ���อ�ิ��ลา���ะ�ั��ึ� {0} ��ยั� {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "�รว�สอ�สิ��ิ���วย��ิร���วอร� LDAP ล�ม�หลว"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1268
 msgid "Failed to delete contact"
 msgstr "�ม�สามาร�ล��ู��ิ���อ"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "�ารสร�า�สมุ��ี�อยู��อ� GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "��ิร���วอร� LDAP �ม��อ�ส�อ��ั���อมูล schema �ี��ู���อ�"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "�ุ�ลั�ษ�ะ�า�อย�า�อา��ะ�ม��หมาะ�ั���ิร���วอร��ั��ุ�ั��อ��ุ�"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "สมุ��ี�อยู� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "รู�ภา��ี��ุ��ลือ�มี��า��ห�� �ุ���อ��าร�รั���า���อ�หรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -130,15 +135,15 @@ msgstr ""
 "��ิร���วอร� LDAP �ี�อา��ะ��� LDAP รุ�����า �ึ���ม�รอ�รั��าร�ำ�า��ี� "
 "หรืออา��ะมี�าร�ำห����า�ิ��ลา� �รุ�าสอ��าม�ู��ู�ลระ���อ��ุ� ��ี�ยว�ั��ุ��ั��������หา�ี�รอ�รั�"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "สมุ��ี�อยู��ี��ม�สามาร���ิ����"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "��ิร���วอร�สมุ��ี�อยู��ม�มี�า��าร����ี���ะ�ำ�ลย"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -146,31 +151,31 @@ msgstr ""
 "สมุ��ี�อยู��ี�อา��ะ�ม�สามาร����า�ึ���� หรืออา��ะสะ���ื�อ��ิร���วอร��ิ� "
 "หรือ�าร��ื�อม��อ��รือ��าย�อ��ุ�หลุ���"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "สมุ��ี�อยู��ี��ะ�ู�ล�������าวร"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "��ิร���วอร��ี��ม�รอ�รั���อมูล schema �อ� LDAPv3"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "�ม�สามาร���ิ�สมุ��ี�อยู�"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "�ม�สามาร��ำ��ิ��าร���หา"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "�ม�สามาร��ั��ึ� {0}"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล�หรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -178,7 +183,7 @@ msgstr ""
 "�ุ��ำลั��ยายามย�าย�ู��ิ���อ�า�สมุ��ี�อยู�ห�ึ����ยั�อี��ี�ห�ึ�� ����ม�สามาร�ล�ออ��า�����า���� "
 "�ุ���อ��าร�ะ��ลี�ย������าร�ั��ึ��ู��ิ���อ�ี�����ารย�ายหรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -187,54 +192,44 @@ msgstr ""
 "�ุ��ำลั���ื�อม��อ�ั���ิร���วอร� GroupWise รุ���ี��ม����รอ�รั� อา��ะ�ำ�ห���ิ��ั�หา�าร��� "
 "Evolution �า��ี��ี�ี�สุ��ือ��ิร���วอร��วร�รั��รุ��ห�����ั�รุ���ี�รอ�รั�"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "�ุ��ม�มีสิ��ิ�ล��ู��ิ���อ��สมุ��ี�อยู��ี�"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "�ุ������ลี�ย���ล�������ู��ิ���อ�ี����ล�ว �ุ���อ��าร�ั��ึ��าร��ลี�ย���ล�หรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "�ู��ิ���อ {0} �ี��ะยั��ม�สามาร������� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "�_�ิ�ม"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "_ละ�ิ��"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "�_ม���อ��ั��ึ�"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "_�รั���า�"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "�_���าม�ั��"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "�ี�อยู�สำหรั� sync �ริยาย:"
@@ -251,7 +246,7 @@ msgstr "�ม�สามาร�อ�า��ล�อ���ร��ร
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "วั��ร�รอ�"
 
@@ -262,261 +257,236 @@ msgstr "วั��ร�รอ�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:116
 msgid "Birthday"
 msgstr "วั���ิ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "�ว��ล�อ�:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ห_มว�..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "��ิ�ิ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "�ู��ิ���อ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "��รื�อ�มือ������ู��ิ���อ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "อี�มล"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "ว�า�/�ม�ว�า�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "�ื�อ�_��ม..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "��า�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "�ฮม���:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "รู�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "�ารส����อ�วาม�ั���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "อา�ี�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "�ี�อยู���รษ�ีย�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "������ล��"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "�ื�อ�_ล��:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "�ั��ึ���อ�วาม"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "อื���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "��อมูลส�ว��ุ��ล"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "��รศั���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "�ารส���าภา�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "�ี�อยู��ว������"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "�ว��ล�อ�:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "�ี�อยู��ว������"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "�า�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_�ี�อยู�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "วั��ร�_รอ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "�ู�_��วย:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "วั��_�ิ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "�ว�_�ล�อ�:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:863
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_��ิ�ิ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "�_มือ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "�ริษั_�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_�ระ��ศ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "�_���: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "�_�����วย�ื�อ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "_ว�า�/�ม�ว�า�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "�ฮ_ม���:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "�ู�_�ั��าร:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "_สำ�ั��า�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_�ู���รษ�ีย�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "_อา�ี�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "�ู�ส_มรส:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "_รั�/�ั�หวั�:"
 
 # "_�ำ�ห���//_�ำ�ำห��า�ื�อ:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "�ารส���า_ภา�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "_��อ��ารรั��มล HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "�ว�_�ล�อ�:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "�_หล��:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "_รหัส��รษ�ีย�:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "�ื�อ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "��������"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -558,7 +528,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "��ิ���อ�ิ��ลา���ะ��ิ�ม�ู��ิ���อ"
 
@@ -570,45 +540,21 @@ msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย�
 msgid "Error removing contact"
 msgstr "��ิ���อ�ิ��ลา���ะล��ู��ิ���อ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "สมุ�����า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "สมุ��ลาย�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "�����ู��ิ���อ�หม�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "�����อมูล�ี���ีย����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "�����อมูล�ั��ั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "มี�าร��ลี�ย���ล�"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "��รื�อ�มือ������ู��ิ���อ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 msgid "Please select an image for this contact"
 msgstr "�รุ�า�ลือ�รู�สำหรั��ู��ิ���อ�ี�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "�_ม�มีรู�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -616,56 +562,46 @@ msgstr ""
 "��อมูล�ู��ิ���อ�ิ��ลา�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' มีรู�����ี��ม��ู���อ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' มีรู�����ี��ม��ู���อ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ว�า���ล�า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "�ู��ิ���อ�ิ��ลา�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "�าร��ิ�ม�ู��ิ���ออย�า��ร�ว"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "�_�������มรู����"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_�ื�อ���ม"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "อี�_มล"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "�_ลือ�สมุ��ี�อยู�"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "��ลล�"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "วั��ุ��� (singleton) EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "�ร."
@@ -732,7 +668,7 @@ msgid "_Suffix:"
 msgstr "�ำ��อ_��าย�ื�อ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:683
 msgid "Contact List Editor"
 msgstr "��รื�อ�มือ�����ราย�ื�อ�ู��ิ���อ"
 
@@ -749,7 +685,7 @@ msgid "_List name:"
 msgstr "_ราย�ื�อ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "�_ลือ�..."
 
@@ -757,39 +693,27 @@ msgstr "�_ลือ�..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_�ิม���ี�อยู�อี�มล หรือลา��ู��ิ���อมาวา��ี�ราย�ื�อ��า�ล�า��ี�:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:776
 msgid "Contact List Members"
 msgstr "สมา�ิ�ราย�ื�อ�ู��ิ���อ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:924
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1340
 msgid "_Members"
 msgstr "_สมา�ิ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error adding list"
 msgstr "��ิ���อ�ิ��ลา���ะ��ิ�มราย�ื�อ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error modifying list"
 msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย���ล�ราย�ื�อ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1207
 msgid "Error removing list"
 msgstr "��ิ���อ�ิ��ลา���ะล�ราย�ื�อ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "สมุ�"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "����ราย�ื�อ�หม�"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "�ู��ิ���อ�ี���ลี�ย�:"
@@ -827,31 +751,31 @@ msgstr ""
 "�ุ�ยั���อ��าร�ะ��ิ�ม���า��อี�หรือ�ม�?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_�สา�"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "�สา���อมูล�ู��ิ���อ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "��อมูล��� มี�ำว�า"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "อี�มล�ึ�������วย"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "�ื�อมี�ำว�า"
 
@@ -870,91 +794,62 @@ msgstr[1] "�ู��ิ���อ %d ราย�าร"
 msgid "Error getting book view"
 msgstr "��ิ���อ�ิ��ลา���ะสร�า���อ��ส��สมุ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "�ำ���"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "�าร���หา�ู��ั��ั�หวะ"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "��อมูล��ร�สร�า�"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย���ล��าม�ั�ร"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "�ั��ู��ิ���อ�ี��ลือ����า�ลิ��อร��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "�ั�ลอ��ู��ิ���อ�ี��ลือ����า�ลิ��อร��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "��ะ�ู��ิ���อ�า��ลิ��อร��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "ล��ู��ิ���อ�ี��ลือ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "�ลือ��ู��ิ���อ�ั��หม��ี�มอ��ห��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "มุมมอ���ลล�"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "�หล��"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "�ุ������หรือ�ม�ว�า�ะล�ราย�ื�อ�ู��ิ���อ�หล�า�ี�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete this contact list?"
 msgstr "�ุ������หรือ�ม�ว�า�ะล�ราย�ื�อ�ู��ิ���อ�ี�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "�ุ������หรือ�ม�ว�า�ะล�ราย�ื�อ�ู��ิ���อ�ี� (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contacts?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ู��ิ���อ�หล�า�ี�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ู��ิ���อ�ี�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "�ุ������หรือ�ม�ว�า�ะล��ู��ิ���อ�ี� (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -963,11 +858,11 @@ msgstr ""
 "���าร��ิ��ู��ิ���อ %d ราย�าร �ะ��ิ���ห��า��า��หม� %d ห��า��า�\n"
 "�ุ���อ��าร�ห��ส���ู��ิ���อ�หล�า�ี��ั��หม��ริ�หรือ�ม�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "_Don't Display"
 msgstr "�_ม��ส��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1469
 msgid "Display _All Contacts"
 msgstr "�ส���ู��ิ���อ_�ั��หม�"
 
@@ -1102,7 +997,7 @@ msgid "Radio"
 msgstr "วิ�ยุสื�อสาร"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "���า�"
@@ -1128,7 +1023,6 @@ msgstr "���ล���"
 
 # "�ำ�ห���//�ื�อ"
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr ""
 
@@ -1140,59 +1034,7 @@ msgstr "ห��วย�า�"
 msgid "Web Site"
 msgstr "�ว������"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "�ว�า�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "สู�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "มี���ัส"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "�����อมูล"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "�ื�อ�����อมูล"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "��อมูล��อ�วาม"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "�วามยาวสู�สุ��อ��ื�อ�����อมูล"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "�วาม�ว�า��อลัม��"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1202,7 +1044,7 @@ msgstr ""
 "\n"
 "�ำลั����หา�ู��ิ���อ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1216,7 +1058,7 @@ msgstr ""
 "\n"
 "หรือ�ั���ิล�ลิ��ี��ี���ื�อสร�า��ู��ิ���อ�หม�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1230,7 +1072,7 @@ msgstr ""
 "\n"
 "�ั���ิล�ลิ��ร��ี���ื�อสร�า��ู��ิ���อ�หม�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1240,7 +1082,7 @@ msgstr ""
 "\n"
 "���หา�ู��ิ���อ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1250,10 +1092,6 @@ msgstr ""
 "\n"
 "�ม�มีราย�าร�ส�����ี�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "�ัว��ล�"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "อี�มล�ี��ำ�า�"
@@ -1263,18 +1101,10 @@ msgid "Home Email"
 msgstr "อี�มล��า�"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "อี�มลอื���"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "�ลือ�อยู�"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "มี��อร���อร�"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1317,17 +1147,17 @@ msgid "Copy _Email Address"
 msgstr "_�ั�ลอ��ี�อยู�อี�มล"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "�ั�ลอ��ี�อยู�อี�มล���า�ลิ��อร��"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "ส����อ�วาม�_หม����ึ�..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "�ะส���มล��ยั��ี�อยู��ี�หรือ�ม�?"
 
@@ -1363,22 +1193,22 @@ msgid "Video Chat"
 msgstr "�ารส���าภา�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "��ิ�ิ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ว�า�/�ม�ว�า�"
@@ -1406,21 +1236,19 @@ msgid "Web Log"
 msgstr "�ว��ล�อ�"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:176
+#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:180
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "ส�ว��ุ��ล"
@@ -1437,8 +1265,8 @@ msgstr "�ฮม���"
 msgid "Blog"
 msgstr "�ว��ล�อ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "�ลิ���ื�อส���มล��ยั� %s"
@@ -1496,10 +1324,10 @@ msgstr "��ร���อล�ี��ม�รอ�รั�"
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2675
 msgid "Canceled"
 msgstr "ย��ลิ�"
 
@@ -1626,27 +1454,27 @@ msgstr "�ำ����ี��ม�สำ�ร��สม�ูร��
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "�ลือ�สมุ��ี�อยู�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "ราย�ื�อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "ย�าย�ู��ิ���อ��ยั�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "�ั�ลอ��ู��ิ���อ��ยั�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "ย�าย�ู��ิ���อ��ยั�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "�ั�ลอ��ู��ิ���อ��ยั�"
 
@@ -1654,54 +1482,61 @@ msgstr "�ั�ลอ��ู��ิ���อ��ยั�"
 msgid "Card View"
 msgstr "มุมมอ��าม�ั�ร"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:713
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "�ำลั��ำ���า..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1001
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV �อ� Outlook หรือ���� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1002
 msgid "Outlook CSV and Tab Importer"
 msgstr "��รื�อ�มือ�ำ���า Outlook CSV �ละ����"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1010
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV หรือ���� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1011
 msgid "Mozilla CSV and Tab Importer"
 msgstr "��รื�อ�มือ�ำ���า Mozilla CSV �ละ����"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1019
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV หรือ���� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1020
 msgid "Evolution CSV and Tab Importer"
 msgstr "��รื�อ�มือ�ำ���า CSV �ละ�����อ� Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "��รื�อ�มือ�ำ���า LDIF �อ� Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "��รื�อ�มือ�ำ���า vCard �อ� Evolution"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:737
+#, c-format
+msgid "Page %d"
+msgstr "ห��า %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1776,20 +1611,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "�ำลั����า�����ิร���วอร� LDAP ����ิร�าม"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "�ารยื�ยั��ัว�ุ��ลล�ม�หลว\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "��อ�รหัส��า�สำหรั� %s (�ู���� %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1812,15 +1647,15 @@ msgstr "'{0}' ������ิ�ิ��ี�อ�า����อย
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr "�าร��ิ�มสรุ����วามสำ�ั��อ��ั�หมาย �ะ��วย�ห��ู�รั����า����ี�ยว�ั��าร�ั�หมาย�อ��ุ�"
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr "�าร��ิ�มสรุ����วามสำ�ั��อ��ั�หมาย �ะ��วย��ือ��ห��ุ����า����ี�ยว�ั��ั�หมาย�อ��ุ�"
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr "�าร��ิ�มสรุ����วามสำ�ั��อ�ภาร�ิ� �ะ��วย�ห��ู�รั����า����ี�ยว�ั�ภาร�ิ��อ��ุ�"
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr "�าร��ิ�มสรุ����วามสำ�ั��อ�ภาร�ิ� �ะ��วย��ือ��ห��ุ����า����ี�ยว�ั�ภาร�ิ��อ��ุ�"
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1909,38 +1744,34 @@ msgid "Are you sure you want to delete this task?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล�ภาร�ิ��ี�?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "�ุ������หรือ�ม�ว�า��อ��าร�ั��ึ��ั��ึ���วย�ำ��ย�ม���อ�มีสรุ�?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "�ุ������หรือ�ม�ว�า��อ��าร�ั��ึ��ั�หมาย��ย�ม���อ�มีสรุ�?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "�ุ������หรือ�ม�ว�า��อ��ารส���ั�หมาย��ย�ม���อ�มีสรุ�?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "�ุ������หรือ�ม�ว�า��อ��าร�ั��ึ��ั��ึ���วย�ำ��ย�ม���อ�มีสรุ�?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "�ุ������หรือ�ม�ว�า��อ��ารส��ภาร�ิ�����ย�ม���อ�มีสรุ�?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "�ุ������หรือ�ม�ว�า��อ��าร�ั��ึ�ภาร�ิ���ย�ม���อ�มีสรุ�?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "�หล��������อมูล��ิ�ิ��ม������ื�อม��ออยู�"
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "�ม�สามาร�สร�า��ห�ุ�าร���หม�"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "�ม�สามาร��ั��ึ��ห�ุ�าร��"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "ล���ิ�ิ� '{0}' หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "ล�ราย�าร�ั��ึ���วย�ำ '{0}' หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "ล�ราย�ารภาร�ิ� '{0}' หรือ�ม�?"
 
@@ -1983,146 +1814,133 @@ msgstr "��ิ���อ�ิ��ลา���ะ�รีย��ู
 msgid "Error loading task list"
 msgstr "��ิ���อ�ิ��ลา���ะ�รีย��ูราย�ารภาร�ิ�"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "��ิ���อ�ิ��ลา��ี� '{0}'"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "��า�ุ��ม�ส���ระ�าศ�����ารย��ลิ� �ู�มีส�ว�ร�วม��อื��� �ะ�ม��รา�ว�ามี�ารย��ลิ��าร�ระ�ุม"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "��า�ุ��ม�ส���ระ�าศ�����ารย��ลิ� �ู�มีส�ว�ร�วม��อื��� �ะ�ม��รา�ว�า���มี�ารล��ั��ึ���วย�ำ�ล�ว"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "��า�ุ��ม�ส���ระ�าศ�����ารย��ลิ� �ู�มีส�ว�ร�วม��อื��� �ะ�ม��รา�ว�า���มี�ารล�ภาร�ิ��ล�ว"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "�ม�มี�าร�อ�ส�อ��า���ิร���วอร�"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "�ารส����อมูล�ี��รั��รุ�สามาร��ห��ู�มีส�ว�ร�วม��อื������รั��รุ���อมูล�ี���ิ�ิ���วย"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "�ารส����อมูล�ี��รั��รุ�สามาร��ห��ู�มีส�ว�ร�วม��อื������รั��รุ�ราย�ารภาร�ิ���วย"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "�ำลั�อยู�ระหว�า��าว���หล����ม����า��ิ�� ��า�ุ��ั��ึ��ั�หมาย�อ��ี� �ะสู��สีย���ม����ั��ล�าว"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "�ำลั�อยู�ระหว�า��าว���หล����ม����า��ิ�� ��า�ุ��ั��ึ�ภาร�ิ��อ��ี� �ะสู��สีย���ม����ั��ล�าว"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr "�ุ�ลั�ษ�ะ�า�อย�า�อา��ำ�า��ม�สม�ูร������ิร���วอร��ั��ุ�ั��อ��ุ�"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "��ิ�ิ� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "��ิ�ิ� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "�ั��ึ���วย�ำ Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ภาร�ิ� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "�ม�����ำ��รื�อ�หมาย�ี���ิ�ิ���ื�อ�าร����า����ออ��ล��"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "�ม�����ำ��รื�อ�หมาย�ี�ราย�าร�ั��ึ���วย�ำ��ื�อ�าร����า����ออ��ล��"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "�ม�����ำ��รื�อ�หมาย�ี�ราย�ารภาร�ิ���ื�อ�าร����า����ออ��ล��"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "��ิ�ิ��ี��ะ�ู�ล�ออ�อย�า��าวร"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "ราย�าร�ั��ึ���วย�ำ�ี��ะ�ู�ล�ออ�อย�า��าวร"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "ราย�ารภาร�ิ��ี��ะ�ู�ล�ออ�อย�า��าวร"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "�ม�สามาร���ิ���ิ�ิ�"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ����ั�หมาย�ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ����าร�ระ�ุม�ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ����ั��ึ���วย�ำ�ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ���ภาร�ิ��ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�ุ���อ��ารส���ระ�าศ�ารย��ลิ�สำหรั��ั��ึ���วย�ำ�ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "�ุ���อ��ารส���ระ�าศ�����ารย��ลิ���ยั��ู�มีส�ว�ร�วม�ุ���หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "�ุ���อ��ารส���าร��ิ��ระ�ุม��ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "�ุ���อ��ารส��ภาร�ิ��ี���ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "�ุ���อ��ารส����อมูล�าร�ระ�ุม�ี��รั��รุ���ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "�ุ���อ��ารส����อมูล�ี��รั��รุ��อ�ภาร�ิ���ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2131,61 +1949,57 @@ msgstr ""
 "�ุ��ำลั���ื�อม��อ�ั���ิร���วอร� GroupWise รุ���ี��ม����รอ�รั� อา��ะ�ำ�ห���ิ��ั�หา�าร��� "
 "Evolution �า��ี��ี�ี�สุ��ือ�วร�รั�รุ����ิร���วอร��ห�����รุ���ี�รอ�รั�"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "�ุ������ลี�ย���ล��ั�หมาย�ี� ���ยั��ม�����ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "�ุ������ลี�ย���ล��าร�ระ�ุม�ี� ���ยั��ม�����ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "�ุ������ลี�ย���ล�ภาร�ิ��ี� ���ยั��ม�����ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "�ุ������ลี�ย���ล��ั��ึี���อ�วาม�ี� ���ยั��ม�����ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "��ิ�ิ��อ��ุ��ะ����า��ม���� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "�ั��ึ���วย�ำ�อ��ุ��ะ����า��ม���� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "��อมูลภาร�ิ��อ��ุ��ะ����า��ม���� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "�_ม�ส����าร��ลี�ย���ล�"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_�ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "_�ั��ึ��าร��ลี�ย���ล�"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_ส��"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "_ส���ระ�าศ"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}"
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "�ย��ห�ุ�าร���ี��ิ��วลาหลายวั�:"
@@ -2240,7 +2054,7 @@ msgid_plural "hours"
 msgstr[0] "�ั�ว�ม�"
 msgstr[1] "�ั�ว�ม�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "�วลา�ริ�ม"
 
@@ -2255,10 +2069,10 @@ msgstr "ละ�ิ���ั��ห_ม�"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "ส�า��ี�:"
 
@@ -2271,11 +2085,11 @@ msgid "_Dismiss"
 msgstr "_ละ�ิ��"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1025
+#: ../calendar/gui/dialogs/comp-editor.c:1021
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1646
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "�_����"
@@ -2285,10 +2099,10 @@ msgid "_Snooze"
 msgstr "_�ั���อ�"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "�ั�ว�ม�"
 
@@ -2296,40 +2110,41 @@ msgstr "�ั�ว�ม�"
 msgid "location of appointment"
 msgstr "ส�า��ี��ั�หมาย"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "�า�ี"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "�ม�มีสรุ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "�ม�มี�ำอ�ิ�ายรายละ�อีย�อยู�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "�ม�มี��อมูลส�า��ี�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1516
 #, c-format
 msgid "You have %d alarms"
 msgstr "�ุ�มี�าร��ือ� %d ราย�าร"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "�ำ��ือ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2340,7 +2155,7 @@ msgstr ""
 "����าร��ือ��วาม�ำ�ี�����ำห����า�ห�ส��อี�มล\n"
 "Evolution �ะ�ส���ล�อ�����อ���ือ��วาม�ำ�าม���ิ���"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2357,7 +2172,7 @@ msgstr ""
 "\n"
 "�ุ������หรือ�ม� �ี��ะ�รีย���ร��รม�ี�?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "�ม���อ��าม��ี�ยว�ั���ร��รม�ี�อี��รั��"
 
@@ -2399,7 +2214,7 @@ msgid "Alarm programs"
 msgstr "��ร��รม��ือ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "��ว��วลา����วิ�า�ี�ี��ะ�ส����อ�ิ��ลา������ส�า�ะ"
 
@@ -2718,37 +2533,33 @@ msgid "Show type field in the event/task/meeting editor"
 msgstr "�ส����อ���อมูล��ิ�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุม"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week number in Day and Work Week View"
-msgstr "�ส��สั��าห��ี���มุมมอ�วั��ละสั��าห��ำ�า�"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "�ส��สั��าห��ี���มุมมอ�วั�, มุมมอ�สั��าห��ำ�า�, �ละ����ิ�ิ��ลือ�วั��ี�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in date navigator"
-msgstr "�ส��สั��าห��ี�����ิ�ิ��ลือ�วั��ี�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 "��า�ำห�� �ะ�ส������วลา�ี�สอ���มุมมอ�วั� ��าสำหรั��ีย��ี�มีรู�����ล�าย�ั���า�ี�������ีย� 'timezone'"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "รู�����าร�ั�ห��า�อภาร�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า�ภาร�ิ� (��ว�อ�)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า�ภาร�ิ� (��ว�ั��)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "สี�อ�ภาร�ิ��ี��ึ��ำห��วั��ี�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2757,7 +2568,7 @@ msgstr ""
 "���ร�า� URL �ี��ะ���������อมูลสำรอ�สำหรั�ส�า�ะว�า�/�ม�ว�า� ��� %u ���ส�ว��ู�������ี�อยู��มล �ละ %"
 "d ������ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2765,7 +2576,7 @@ msgstr ""
 "����วลา�ริยาย�ี��ะ�����วั��ละ�วลา����ิ�ิ� ��ย�ำห�������ำ�ห����า���อมูล����วลา Oslen "
 "�ี�ยั��ม���ล����ภาษา��อ��ิ�� ���� \"Asia/Bangkok\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2775,7 +2586,7 @@ msgstr ""
 "\" (�����ั�) �ะวา���อ��ส���ัวอย�า��ว����ราย�ื�อ�ั��ึ���อ�วาม \"1\" (�����ว�ั��) "
 "�ะวา���อ��ส���ัวอย�า��ว���า�ราย�ื�อ�ั��ึ���อ�วาม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2785,176 +2596,172 @@ msgstr ""
 "�ะวา���อ��ส���ัวอย�า��ว����ราย�ารภาร�ิ� \"1\" (�����ว�ั��) "
 "�ะวา���อ��ส���ัวอย�า��ว���า�ราย�ารภาร�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "����วลา�ี�สอ�สำหรั�มุมมอ�วั�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
 "��า�ี����������มีสาม��า �ือ 0 สำหรั���อ�ิ��ลา�, 1 สำหรั��ำ��ือ� �ละ 2 สำหรั���อ�วาม�ี�ั��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "��ว��วลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "�วลา�อ��าร��ือ��รั����อ� ������ิ� time_t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "����วลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
 "�วาม��ร���ส�อ���อ��ส���ห�ุ�าร����มุมมอ���ิ�ิ� ������าระหว�า� 0 (��ร���ส) �ึ� 1 (�ึ��ส�)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "รู�����วลา 24 �ั�ว�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI �อ���ิ�ิ��ี�����อยู� (��ิ�ิ� \"หลั�\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI �อ�ราย�าร�ั��ึ���วย�ำ�ี�����อยู� (ราย�าร�ั��ึ���วย�ำ \"หลั�\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI �อ�ราย�ารภาร�ิ��ี�����อยู� (ราย�ารภาร�ิ� \"หลั�\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ห��วยสำหรั��าร��ือ��วาม�ำ��ย�ริยาย \"�า�ี\", \"�ั�ว�ม�\" หรือ \"วั�\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ห��วย�อ��าร�ำห���าร��อ�ภาร�ิ� ���� \"�า�ี\", \"�ั�ว�ม�\" หรือ \"วั�\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "�������วลา�อ�ระ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "�������วลา�อ�ระ���������วลา�ี��ลือ��ว��� Evolution"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "�ำ�ห����ส���ั����อ���ว�ั��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "�ริ�ม���สั��าห�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "วั���สั��าห��ริ�ม���สั��าห��า�วั�อา�ิ�ย� (0) �ึ�วั��สาร� (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "�ำห��ว�า�ะ����า�������ือ��ส���าร��ือ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "�ำห��ว�า�ะ�ามยื�ยั���อ�ล��ั�หมายหรือภาร�ิ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "�ำห��ว�า�ะ�ามยื�ยั��มื�อ�ะ�����วา��ั�หมาย�ละภาร�ิ��ี�สั��ล�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 "�ำห��ว�า�ะ�ระ�ั�วั�สุ�สั��าห��มื�อ�ู��อมูลราย��ือ�หรือ�ม� �ึ���ะ�ส��วั��สาร��ละวั�อา�ิ�ย�����อ���ียว"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "�ำห��ว�า�ะ�ส���วลาสิ��สุ��อ��ห�ุ�าร����มุมมอ�สั��าห��ละ��ือ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "�ำห��ว�า�ะวา��ส�� Marcus Bains (�ส���ี��ำ�ห����วลา�ั��ุ�ั�) ����ิ�ิ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "�ำห��ว�า�ะ��อ�ภาร�ิ��ี��สร���ล�ว��มุมมอ�ภาร�ิ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "�ำห��ว�า�ะ�ลื�อ�มุมมอ���ือ��ีละสั��าห�����าร�ลื�อ��ีละ��ือ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "�ำห��ว�า�ะ�ั����า��ือ��วาม�ำ�ริยายสำหรั��ั�หมายหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "�ำห��ว�า�ส����อ���อมูล�ารร�อ��อ�าร�อ��ลั�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูลหมว�หมู�����รื�อ�มือ������ห�ุ�าร��/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูล���า�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูลส�า�ะ����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "�ำห��ว�า�ะ����าร�ส���วลา��รู���� 24 �ั�ว�ม�����าร��� am/pm หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูล����วลา����รื�อ�มือ������ห�ุ�าร��/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูล��ิ�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "�ำห��ว�า�ะ�ส��สั��าห��ี���มุมมอ�วั��ละสั��าห��ำ�า�หรือ�ม�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in the date navigator."
-msgstr "�ำห��ว�า�ะ�ส��สั��าห��ี�����ิ�ิ��ลือ�วั��ี�หรือ�ม�"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "�ำห��ว�า�ะ�ส��สั��าห��ี����ี���า�� ����ิ�ิ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "�ั�ว�ม�สิ��สุ�วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "�า�ีสิ��สุ�วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "�ั�ว�ม��ริ�ม���วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "�า�ี�ริ�ม���วั��ำ�า�"
 
@@ -3004,17 +2811,17 @@ msgid "Classification"
 msgstr "�ระ�ภ�"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:510 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "�����วามลั�"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "�ำ�รรยาย"
@@ -3035,7 +2842,7 @@ msgid "Exist"
 msgstr "มี"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3048,25 +2855,26 @@ msgid "Organizer"
 msgstr "�ู��ระสา��า�"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:508 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ส�ว��ัว"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-cal-model.c:506
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "��ิ���ย"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:319
+#: ../calendar/gui/dialogs/event-editor.c:340
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "�าร�วีย���ำ"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3128,6 +2936,7 @@ msgid "Add Alarm"
 msgstr "��ิ�ม�าร��ือ�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:357
 msgid "Alarm"
 msgstr "�าร��ือ�"
 
@@ -3143,7 +2952,7 @@ msgstr "�สีย���ือ��ลือ��อ�"
 msgid "Mes_sage:"
 msgstr "_��อ�วาม:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:78
 msgid "Options"
 msgstr "�ัว�ลือ�"
 
@@ -3190,11 +2999,12 @@ msgstr "วั�"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "วั�"
 
@@ -3202,19 +3012,20 @@ msgstr "วั�"
 msgid "end of appointment"
 msgstr "สิ��สุ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "�รั����ิ�ม��ิม�ุ��"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "�ั�ว�ม�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "�า�ี"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "�ริ�ม�ั�หมาย"
 
@@ -3233,30 +3044,30 @@ msgid "Alarms"
 msgstr "�าร��ือ�"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "�_ลือ�..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "��ิ�ิ��ี��ลือ���ื�อ���������ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "วั��ี��ละ�วลา:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "วั�_�ี��ละ�วลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "วั��ี�อย�า���ียว:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "_วั��ี�อย�า���ียว:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3287,12 +3098,12 @@ msgstr "30 �า�ี"
 msgid "60 minutes"
 msgstr "60 �า�ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "�าร������ือ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "รู����วั��ี�/�วลา"
@@ -3318,20 +3129,20 @@ msgid "Display alarms in _notification area only"
 msgstr "�ส���าร��ือ���_�ื���ี������ห�ุ���า�ั��"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ศุ�ร�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:55
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2675
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "�ั�ว��"
 
@@ -3344,7 +3155,7 @@ msgid "Minutes"
 msgstr "�า�ี"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "�ั��ร�"
@@ -3358,182 +3169,190 @@ msgid "None"
 msgstr "�ม�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Pick a color"
 msgstr "�ลือ�สี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "อ_า."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "�สาร�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "�_ลื�อ�มุมมอ���ือ��ีละสั��าห�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "����วลา�ี�สอ_�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "�ลือ���ิ�ิ�สำหรั��าร������ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "�_�ือ��วาม�ำ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "��ือ�_�วาม�ำ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "�ส��สั�_�าห��ี�����ิ�ิ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "�ส��สั��าห�_�ี���มุมมอ�วั��ละสั��าห��ำ�า�"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+msgid "Show week _numbers"
+msgstr "�ส��สั�_�าห��ี�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "อา�ิ�ย�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "_ภาร�ิ��ี��ึ��ำห��วั��ี�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "�_ฤ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "ราย�ารภาร�ิ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "รู������อ�วาม:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "�ฤหัส��ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "�วลา"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "�_���วลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "รู�����วลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "อั��าร"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "�������วลา�อ�_ระ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "�ุ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "�ริ�ม���สั_��าห��ี�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "สั��าห��ำ�า�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "วั��ำ�า�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_12 �ั�ว�ม� (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_24 �ั�ว�ม�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "_�าม��ื�อ�ารยื�ยั���ะล�ราย�าร"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "_�ระ�ั�วั�สุ�สั��าห���มุมมอ���ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "�ริ�ม���_วั�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "_ศ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "_��อ�ภาร�ิ��ี��สร���ล�วหลั��า�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "_�."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "ภาร�ิ��ี��_ลย�ำห��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "_ส."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "�_ส���วลาสิ��สุ��ั�หมาย��มุมมอ�สั��าห��ละ��ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "�าร_�ำ����วลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "_อ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "_�."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "��อ�วั��ร�รอ�/วั���ิ��ุ��รั��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 msgid "before every appointment"
 msgstr "��อ��ั�หมาย�ุ��รั��"
 
@@ -3542,12 +3361,12 @@ msgid "Type:"
 msgstr "��ิ�:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "�_�ิ�:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:156
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3566,35 +3385,35 @@ msgstr "�ั�ลอ_���ื�อหาราย�ารภาร�
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "�ั�ลอ_���ื�อหาราย�าร�ั��ึ���วย�ำ�ว��ี���รื�อ���ื�อ�าร�ำ�า����ออ��ล��"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "_สี:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "ราย�าร�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "�ุ�สม�ั�ิ��ิ�ิ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "��ิ�ิ��หม�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "�ุ�สม�ั�ิราย�ารภาร�ิ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "ราย�ารภาร�ิ��_หม�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "�ุ�สม�ั�ิราย�าร�ั��ี���วย�ำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "ราย�าร�ั��ึ���วย�ำ�หม�"
 
@@ -3648,264 +3467,240 @@ msgstr "%s  �ุ��ม�����������อมูล��
 msgid "Validation error: %s"
 msgstr "����อ�ิ��ลา��อ���อมูล: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " �ึ� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr "(�สร�� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "�สร�� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (�ำห���สร�� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "�ำห���สร�� "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:242
 msgid "Could not save attachments"
 msgstr "�ม�สามาร��ั��ึ����ม���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:515
+#: ../calendar/gui/dialogs/comp-editor.c:511
 msgid "Could not update object"
 msgstr "�ม�สามาร��รั���อมูลอ�อ������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:610
 msgid "Edit Appointment"
 msgstr "������ั�หมาย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:617
 #, c-format
 msgid "Meeting - %s"
 msgstr "�าร�ระ�ุม - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Appointment - %s"
 msgstr "�ั�หมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:625
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ภาร�ิ��ี����รั�มอ�หมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:631
+#: ../calendar/gui/dialogs/comp-editor.c:627
 #, c-format
 msgid "Task - %s"
 msgstr "ภาร�ิ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:636
+#: ../calendar/gui/dialogs/comp-editor.c:632
 #, c-format
 msgid "Memo - %s"
 msgstr "�ั��ึ���วย�ำ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:648
 msgid "No Summary"
 msgstr "�ม�มีสรุ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:757
 msgid "Keep original item?"
 msgstr "�ะ����ราย�าร�����ั��ว�หรือ�ม�?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:944
 msgid "Click here to close the current window"
 msgstr "�ลิ��ี��ี���ื�อ�ิ�ห��า��า��ั��ุ�ั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:951 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1485
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "�ั�ลอ�ส�ว��ี��ลือ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:958 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1492
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "�ั�ส�ว��ี��ลือ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:969
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:965
+#: ../shell/e-shell-window-actions.c:1499
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "ล�ส�ว��ี��ลือ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "Click here to view help available"
 msgstr "�ลิ��ี��ี���ื�อ�ูวิ�ี���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:979 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1534
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "��ะ�า��ลิ��อร��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:1000
 msgid "Click here to save the current window"
 msgstr "�ลิ��ี��ี���ื�อ�ั��ึ�ห��า��า��ั��ุ�ั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1007 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1604
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "�ลือ���ื�อ�วาม�ั��หม�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018
+#: ../calendar/gui/dialogs/comp-editor.c:1014
 msgid "_Classification"
 msgstr "�ระ�_ภ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1028 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1653
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "�_��ม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1035
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Help"
 msgstr "_วิ�ี���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1042
 msgid "_Insert"
 msgstr "�_�ร�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1049
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_�ัว�ลือ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1695 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "มุ_มมอ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "���ม�_��..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1068
 msgid "Click here to attach a file"
 msgstr "�ลิ��ี��ี���ื�อ������ม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1076
 msgid "_Categories"
 msgstr "_หมว�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Toggles whether to display categories"
 msgstr "��อ�/�ส����อ���อมูลหมว�หมู�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "Time _Zone"
 msgstr "�_���วลา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "Toggles whether the time zone is displayed"
 msgstr "��อ�/�ส����อ���อมูล����วลา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Pu_blic"
 msgstr "�_�ิ���ย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1097
 msgid "Classify as public"
 msgstr "�ำห�������ระ�ภ���ิ���ย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "_Private"
 msgstr "ส�ว�_�ัว"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "Classify as private"
 msgstr "�ำห�������ระ�ภ�ส�ว��ัว"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "_Confidential"
 msgstr "�����วาม_ลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "Classify as confidential"
 msgstr "�ำห�������ระ�ภ��วามลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "R_ole Field"
 msgstr "��อ���อมูล_���า�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Toggles whether the Role field is displayed"
 msgstr "��อ�/�ส����อ���อมูล���า�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "_RSVP"
 msgstr "_�ารร�อ��อ�าร�อ��ลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "��อ�/�ส����อ���อมูล�ารร�อ��อ�าร�อ��ลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1135
 msgid "_Status Field"
 msgstr "��อ���อมูล_ส�า�ะ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Toggles whether the Status field is displayed"
 msgstr "��อ�/�ส����อ���อมูลส�า�ะ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Type Field"
 msgstr "��อ���อมูล_��ิ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "��อ�/�ส����ิ��ู����า�ระ�ุม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "�อ�สาร_ล�าสุ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1693
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1704
+#: ../composer/e-composer-actions.c:469
 msgid "Attach"
 msgstr "���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1748
-msgid "Save"
-msgstr "�ั��ึ�"
-
 #: ../calendar/gui/dialogs/comp-editor.c:2025
 #: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:3017
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "�วาม��ลี�ย���ล���ราย�าร�ี�อา��ู�ละ�ลย��ามี�าร�รั���อมูล���ามา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2933
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2985
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "���ม���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:3047
 msgid "Unable to use current version!"
 msgstr "�ม�สามาร����รุ���ั��ุ�ั�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "�ม�สามาร���ิ��หล�����"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "�ม�สามาร���ิ��ี��ลาย�า�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "�ี��ลาย�า����อ�า�������า�ั��"
 
@@ -3913,6 +3708,12 @@ msgstr "�ี��ลาย�า����อ�า�������า
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_ล�ราย�าร�ี�ออ��า��ล�อ���หมาย�อ��ู�รั�อื���ั��หม�หรือ�ม�?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#, fuzzy
+#| msgid "P_ercent complete:"
+msgid "_Retract comment"
+msgstr "�_�อร��������า��ี��สร��:"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "�ม�สามาร�ล��ห�ุ�าร����� ��ื�อ��า���ิ���อ�ิ��ลา� corba"
@@ -3973,133 +3774,147 @@ msgstr "มอ��ั��ะ�ห�:"
 msgid "Enter Delegate"
 msgstr "��อ��ู�รั�มอ��ั��ะ"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "_Alarms"
 msgstr "�าร�_�ือ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Click here to set or unset alarms for this event"
 msgstr "�ลิ��ี��ี���ื�อ�ำห��หรือย��ลิ��าร������ือ��อ��ห�ุ�าร���ี�"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:224
+msgid "Show Time as _Busy"
+msgstr "�ส���วลาว�า�_ม�ว�า�"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "Toggles whether to show time as busy"
+msgstr "�ลือ��ส���วลา����ว�า�/�ม�ว�า�"
+
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "_Recurrence"
 msgstr "�าร�_วีย���ำ"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Make this a recurring event"
 msgstr "�ำ�ห������ห�ุ�าร���วีย���ำ"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:242
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "�ัว�ลือ��อ��ารส��"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "Insert advanced send options"
 msgstr "��ร��ัว�ลือ��ั��สู��อ��ารส��"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "All _Day Event"
 msgstr "�ห�ุ�าร��_�ลอ�วั�"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "Toggles whether to have All Day Event"
 msgstr "�ลือ��ห�มี/�ม�มี�ห�ุ�าร���ลอ�วั�"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "�ส���วลาว�า�_ม�ว�า�"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "�ลือ��ส���วลา����ว�า�/�ม�ว�า�"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "_Free/Busy"
 msgstr "_ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "Query free / busy information for the attendees"
 msgstr "สอ��าม��อมูล�ารว�า�/�ม�ว�า��อ��ู����า�ระ�ุม"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "_�ั�หมาย"
+#: ../calendar/gui/dialogs/event-editor.c:316 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "�ั�หมาย"
+
+#: ../calendar/gui/dialogs/event-editor.c:380
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "�ู����า�ระ�ุม"
+
+#: ../calendar/gui/dialogs/event-editor.c:571
+msgid "Print this event"
+msgstr "�ิม���ห�ุ�าร���ี�"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:747
+msgid "Event's start time is in the past"
+msgstr "�วลา�ริ�ม�อ��ห�ุ�าร�����ล�ว��ลยมา�ล�ว"
+
+#: ../calendar/gui/dialogs/event-page.c:788
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "�ม�สามาร�������ห�ุ�าร����� ��ราะ��ิ�ิ��ี��ลือ�สามาร�อ�า����อย�า���ียว"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:792
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "�ม�สามาร�������ห�ุ�าร��������ม�ี� ��ราะ�ุ��ม���������ู��ระสา��า�"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:804
+#: ../calendar/gui/dialogs/event-page.c:2756
 msgid "This event has alarms"
 msgstr "�ห�ุ�าร���ี�มี�าร������ือ�"
 
-#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:871
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "�ู�_�ระสา��า�:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "_Delegatees"
 msgstr "�ู�_รั��ั��ะ"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:920
 msgid "Atte_ndees"
 msgstr "�ู��_��า�ระ�ุม"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1135
 msgid "Event with no start date"
 msgstr "�ห�ุ�าร���ี��ม��อ�วั��ริ�ม���"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1138
 msgid "Event with no end date"
 msgstr "�ห�ุ�าร���ี��ม��อ�วั�สิ��สุ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1309
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "วั��ริ�ม����ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1319
 msgid "End date is wrong"
 msgstr "วั�สิ��สุ��ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1342
 msgid "Start time is wrong"
 msgstr "�วลา�ริ�ม����ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1349
 msgid "End time is wrong"
 msgstr "�วลาสิ��สุ��ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "�ู��ระสา��า��ี��ลือ��ม�มี�ั��ี�ู����อี��ล�ว"
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1517
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "��อ�มี�ู��ระสา��า���วย"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1542
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "��อ��าร�ู����า�ระ�ุมอย�า���อยห�ึ����"
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2630
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "�ม�สามาร���ิ���ิ�ิ� '%s'"
@@ -4110,40 +3925,40 @@ msgstr "�ม�สามาร���ิ���ิ�ิ� '%s'"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2674
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "�ุ��ำลั��ำ��ิ��าร���าม�อ� %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2975
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d วั���อ��ั�หมาย"
 msgstr[1] "%d วั���อ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2981
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d �ั�ว�ม���อ��ั�หมาย"
 msgstr[1] "%d �ั�ว�ม���อ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2987
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d �า�ี��อ��ั�หมาย"
 msgstr[1] "%d �า�ี��อ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3000
 msgid "Customize"
 msgstr "�รั�����"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3002
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "�ม�มี"
@@ -4161,13 +3976,10 @@ msgid "15 minutes before appointment"
 msgstr "15 �า�ี��อ��ั�หมาย"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "�ู����า_�ระ�ุม..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "�ู����า�ระ�ุม"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "�ู��_��า�ระ�ุม..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
@@ -4177,28 +3989,26 @@ msgstr "�สีย���ือ��ลือ��อ�"
 msgid "Event Description"
 msgstr "�ำ�รรยาย�ห�ุ�าร��"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "สรุ_�:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "�_�����ือ�"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_�ำอ�ิ�าย:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "ส�า�_�ี�:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_สรุ�:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "�_วลา:"
@@ -4213,27 +4023,35 @@ msgstr "�����ำ�ว�"
 msgid "until"
 msgstr "�ระ�ั��"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "�ิม���ั��ึ���วย�ำ�ี�"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "�วลา�ริ�ม�อ��ั��ึ���วย�ำ���ล�ว��ลยมา�ล�ว"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "�ม�สามาร�������ั��ึ���อ�วาม��� ��ราะราย�าร�ั��ึ���อ�วาม�ี��ลือ�สามาร�อ�า����อย�า���ียว"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "�ม�สามาร�������ั��ึ���อ�วาม������ม�ี� ��ราะ�ุ��ม���������ู��ระสา��า�"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "�ม�สามาร���ิ��ั��ึ���วย�ำ�� '%s'"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2246
-#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2276
+#: ../mail/em-format-html.c:2335 ../mail/em-format-html.c:2359
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "�ึ�"
 
@@ -4242,67 +4060,72 @@ msgstr "�ึ�"
 msgid "Sta_rt date:"
 msgstr "วั��_ริ�ม���:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "สรุ_�:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_�ึ�:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "�ลุ�_ม:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "�ุ��ำลั���ลี�ย���ล��ห�ุ�าร���วีย���ำ �ุ���อ��าร��ลี�ย���ล�สิ����?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "�ุ��ำลั�มอ��ั��ะ�ห�ุ�าร���วีย���ำ �ุ���อ��ารมอ��ั��ะสิ����?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "�ุ��ำลั���ลี�ย���ล�ภาร�ิ��วีย���ำ �ุ���อ��าร��ลี�ย���ล�สิ����?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "�ุ��ำลั���ลี�ย���ล��ั��ึ���วย�ำ�วีย���ำ �ุ���อ��าร��ลี�ย���ล�สิ����?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "�ร�ี�ี���ย���าะ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "�ร�ี�ี��ละ��อ�ห��า�ี�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "�ร�ี�ี��ละ��อ��"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "�ุ��ร�ี"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�ั�หมาย�ี�มี�าร�วีย���ำ�ี� Evolution �ม�สามาร���������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "วั��ี��ี��วีย���ำ�ม������า�ี�������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "�วลาสิ��สุ��าร�วีย���ำมา��อ��วลา�ริ�ม�อ��ห�ุ�าร��"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "��"
 
@@ -4310,7 +4133,7 @@ msgstr "��"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "วั��ร�"
 
@@ -4319,7 +4142,7 @@ msgstr "วั��ร�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "วั��ี�สอ�"
 
@@ -4327,7 +4150,7 @@ msgstr "วั��ี�สอ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "วั��ี�สาม"
 
@@ -4335,7 +4158,7 @@ msgstr "วั��ี�สาม"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "วั��ี�สี�"
 
@@ -4343,7 +4166,7 @@ msgstr "วั��ี�สี�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "วั��ี�ห�า"
 
@@ -4351,13 +4174,13 @@ msgstr "วั��ี�ห�า"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "วั�สุ���าย"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "วั�อื��"
 
@@ -4365,7 +4188,7 @@ msgstr "วั�อื��"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "วั��ี� 1 �ึ�วั��ี� 10"
 
@@ -4373,7 +4196,7 @@ msgstr "วั��ี� 1 �ึ�วั��ี� 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "วั��ี� 11 �ึ�วั��ี� 20"
 
@@ -4381,45 +4204,45 @@ msgstr "วั��ี� 11 �ึ�วั��ี� 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "วั��ี� 21 �ึ�วั��ี� 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "วั�"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1242
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "�รั��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "��ิ�ม��อย��ว��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "�ม�สามาร�อ�า�ส�ว��ี��ลือ���ื�อ��������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "�������อย��ว��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "�ม�สามาร�อ�า�ส�ว��ี��ลือ���ื�อล����"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "วั�/�วลา"
 
@@ -4431,7 +4254,7 @@ msgstr "�ุ�� "
 msgid "Exceptions"
 msgstr "��อย��ว��"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:86
 msgid "Preview"
 msgstr "�ัวอย�า�"
 
@@ -4455,11 +4278,11 @@ msgstr "สั��าห�"
 msgid "year(s)"
 msgstr "�ี"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
-msgstr "ส���าร������ือ��อ���า����า���ั��ห�ุ�าร���ี���วย"
+msgstr "ส���าร������ือ��อ��ั����ั��ห�ุ�าร���ี���วย"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "�����ู����า�ระ�ุมราย�ห_ม����า�ั��"
 
@@ -4468,19 +4291,19 @@ msgstr "�����ู����า�ระ�ุมราย�ห_ม
 msgid "Completed date is wrong"
 msgstr "วั��ี��สร���ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "�ว�����"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "�สร���ล�ว"
@@ -4488,35 +4311,35 @@ msgstr "�สร���ล�ว"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1126 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "สู�"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "�ำลั��ำ��ิ��าร"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1124 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "��ำ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1315 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../calendar/gui/e-cal-model.c:1254 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1125
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "���ิ"
@@ -4524,10 +4347,10 @@ msgstr "���ิ"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ยั��ม��ริ�ม"
 
@@ -4543,8 +4366,8 @@ msgstr "_ส�า�ะ:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4553,7 +4376,7 @@ msgstr "ส�า�ะ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "�ม�����ำห��"
@@ -4563,7 +4386,7 @@ msgid "_Date completed:"
 msgstr "_วั��ี��ำ�สร��:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_ระ�ั��วามสำ�ั�:"
 
@@ -4571,53 +4394,62 @@ msgstr "_ระ�ั��วามสำ�ั�:"
 msgid "_Web Page:"
 msgstr "�_ว�����:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "_Status Details"
 msgstr "รายละ�อีย�_ส�า�ะ"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "Click to change or view the status details of the task"
 msgstr "�ลิ���ื�อ�ูหรือ��ลี�ย�รายละ�อีย�ส�า�ะ�อ�ภาร�ิ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:124
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "�ัว�_ลือ��อ��ารส��"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "_ภาร�ิ�"
+#: ../calendar/gui/dialogs/task-editor.c:325 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "ภาร�ิ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:328
 msgid "Task Details"
 msgstr "รายละ�อีย�ภาร�ิ�"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:370
+msgid "Print this task"
+msgstr "�ิม��ภาร�ิ��ี�"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "�วลา�ริ�ม�อ�ภาร�ิ����ล�ว��ลยมา�ล�ว"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "�ำห���สร���อ�ภาร�ิ����ล�ว��ลยมา�ล�ว"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "�ม�สามาร������ภาร�ิ���� ��ราะราย�ารภาร�ิ��ี��ลือ�สามาร�อ�า����อย�า���ียว"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "�ม�สามาร������ภาร�ิ�������ม�ี� ��ราะ�ุ��ม���������ู��ระสา��า�"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "�ู��ระ_สา��า�:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "วั��ำห���สร���า��ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "�ม�สามาร���ิ�ภาร�ิ��� '%s'"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "�ู��_��า�ระ�ุม..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "ห_มว�..."
@@ -4715,7 +4547,7 @@ msgid "Categories:"
 msgstr "หมว�:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "สรุ�:"
 
@@ -4730,8 +4562,8 @@ msgstr "วั��ำห���สร��:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "ส�า�ะ:"
 
@@ -4740,8 +4572,8 @@ msgid "Priority:"
 msgstr "ระ�ั��วามสำ�ั�:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "�ำอ�ิ�าย:"
 
@@ -4756,32 +4588,32 @@ msgstr "ห��า�ว��:"
 msgid "Created"
 msgstr "สร�า�"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "วั�สิ��สุ�"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "��ลี�ย���ล�ล�าสุ�"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "วั��ริ�ม���"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "ว�า�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "�ม�ว�า�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4792,63 +4624,47 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 msgid "Yes"
 msgstr "��ล�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "�ม���ล�"
 
-#: ../calendar/gui/e-cal-model.c:378
-msgid "Default Client"
-msgstr "��ร��รมลู���าย�ริยาย"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:868
-msgid "Shell Settings"
-msgstr "��า�ั����ลล�"
-
-#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:869
-msgid "Application-wide settings"
-msgstr "��า�ั���ี�มี�ล�ั�ว�ั����ร��รม"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:512 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "�ม��รา�"
 
-#: ../calendar/gui/e-cal-model.c:1317
+#: ../calendar/gui/e-cal-model.c:1256
 msgid "Recurring"
 msgstr "�วีย���ำ"
 
-#: ../calendar/gui/e-cal-model.c:1319
+#: ../calendar/gui/e-cal-model.c:1258
 msgid "Assigned"
 msgstr "มอ�หมาย"
 
-#: ../calendar/gui/e-cal-model.c:2225
+#: ../calendar/gui/e-cal-model.c:2156
 #, c-format
 msgid "Opening %s"
 msgstr "�ำลั���ิ� %s"
@@ -4885,97 +4701,97 @@ msgid "Start date"
 msgstr "วั��ริ�ม���"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "��ิ�"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "�ั��ห�ุ�าร���ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "�ั�ลอ��ห�ุ�าร���ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "��ะ�ห�ุ�าร���า��ลิ��อร��"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "ล��ห�ุ�าร���ี��ลือ�"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "�ำลั�ล�อ�อ�������ี��ลือ�"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "�ำลั��รั���อมูลอ�อ��������า��"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2330
 msgid "Accepted"
 msgstr "�อ�รั��ล�ว"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Declined"
 msgstr "��ิ�ส�"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "�ม����"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "ส���ู�������า�ระ�ุม"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 msgid "Needs action"
 msgstr "��อ��ำ��ิ��าร"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "�ู��ระสา��า�: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "�ู��ระสา��า�: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "ส�า��ี�: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "�วลา: %s %s"
@@ -5018,8 +4834,8 @@ msgstr "�ส������วลา�ี�สอ�"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1883
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5029,10 +4845,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1900
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:990
+#: ../calendar/gui/e-day-view-top-item.c:882 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5041,31 +4857,35 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1916
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../calendar/gui/e-day-view-top-item.c:886 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1116 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2613
+#: ../calendar/gui/e-day-view.c:2637
 #, c-format
 msgid "Week %d"
 msgstr "สั��าห��ี� %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "�วีย���ำ:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "��� (�าร�วีย���ำ����ั���อ�)"
@@ -5147,7 +4967,7 @@ msgstr "สิ��สุ�"
 msgid "Due"
 msgstr "�ึ��ำห��"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "��อมูล iCalendar"
 
@@ -5156,303 +4976,303 @@ msgstr "��อมูล iCalendar"
 msgid "iCalendar Error"
 msgstr "��อ�ิ��ลา� iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "�ุ��ล�ิร�าม"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr "<br> �รุ�า�ู��อมูล��า�ล�า��ี� �ล�ว�ลือ���ิ�ั�ิ�าร�า��ม�ู��า�ล�า� "
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr "�รุ�า�ู��อมูล��า�ล�า��ี� �ล�ว�ลือ���ิ�ั�ิ�าร�า��ม�ู��า�ล�า�"
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2317
 msgctxt "cal-itip"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Tentatively Accepted"
 msgstr "อา��อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "มี�ารสั��ย��ลิ��าร�ระ�ุม ���หา�ม�������ิ�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "มี�ารสั��ย��ลิ�ภาร�ิ� ���หา�ม�����ราย�ารภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> ����ระ�าศ��อมูล�าร�ระ�ุม"
+msgid "%s has published meeting information."
+msgstr "%s ����ระ�าศ��อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "��อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> �อ�ห� %s ���าร�วม�ระ�ุม"
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s �อ�ห� %s ���าร�วม�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> �อ�ห��ุ����าร�วม�ระ�ุม"
+msgid "%s requests your presence at a meeting."
+msgstr "%s �อ�ห��ุ����าร�วม�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "���า��ร��าร�ระ�ุม"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> ��อ��าร���าร�วม�าร�ระ�ุม�ี�มีอยู�"
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s ��อ��าร���าร�วม�าร�ระ�ุม�ี�มีอยู�"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "�รั��รุ���อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> ��อ��ารรั���อมูล�าร�ระ�ุมล�าสุ�"
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s ��อ��ารรั���อมูล�าร�ระ�ุมล�าสุ�"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "��อ��าร�าร�รั���อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> ����อ��ลั��ารร�อ��อ��ี�ยว�ั��าร�ระ�ุม"
+msgid "%s has replied to a meeting request."
+msgstr "%s ����อ��ลั��ารร�อ��อ��ี�ยว�ั��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "�าร�อ��ลั��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> ���ย��ลิ��าร�ระ�ุม"
+msgid "%s has canceled a meeting."
+msgstr "%s ���ย��ลิ��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "�ารย��ลิ��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> ���ส����อ�วาม�ี�อ�า��ม����มา�ห�"
+msgid "%s has sent an unintelligible message."
+msgstr "%s ���ส����อ�วาม�ี�อ�า��ม����มา�ห�"
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "��อ�วาม�าร�ระ�ุม�ิ��ลา�"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> ����ระ�าศ��อมูล�อ�ภาร�ิ�"
+msgid "%s has published task information."
+msgstr "%s ����ระ�าศ��อมูล�อ�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "��อมูลภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> �อ�ห� %s ��ิ�ั�ิภาร�ิ�"
+msgid "%s requests %s to perform a task."
+msgstr "%s �อ�ห� %s ��ิ�ั�ิภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> �อ�ห��ุ���ิ�ั�ิภาร�ิ�"
+msgid "%s requests you perform a task."
+msgstr "%s �อ�ห��ุ���ิ�ั�ิภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "��อ�ส�อภาร�ิ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> ��อ��าร���าร�วม��ภาร�ิ��ี�มีอยู�"
+msgid "%s wishes to be added to an existing task."
+msgstr "%s ��อ��าร���าร�วม��ภาร�ิ��ี�มีอยู�"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "�รั���อมูลภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> ��อ��ารรั���อมูลภาร�ิ�ล�าสุ�"
+msgid "%s wishes to receive the latest task information."
+msgstr "%s ��อ��ารรั���อมูลภาร�ิ�ล�าสุ�"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "��อ��าร�าร�รั���อมูลภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> ����อ��ลั���ยั��ารมอ�หมายภาร�ิ�"
+msgid "%s has replied to a task assignment."
+msgstr "%s ����อ��ลั���ยั��ารมอ�หมายภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "�าร�อ��ลั���ี�ยว�ั�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> ���ย��ลิ�ภาร�ิ�"
+msgid "%s has canceled a task."
+msgstr "%s ���ย��ลิ�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "�ารย��ลิ�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "��อ�วามภาร�ิ��ิ��ลา�"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> ����ระ�าศ��อมูลส�า�ะว�า�/�ม�ว�า�"
+msgid "%s has published free/busy information."
+msgstr "%s ����ระ�าศ��อมูลส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "��อมูล ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> ��อ��าร��อมูล ว�า�/�ม�ว�า� �อ��ุ�"
+msgid "%s requests your free/busy information."
+msgstr "%s ��อ��าร��อมูล ว�า�/�ม�ว�า� �อ��ุ�"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "�ารร�อ��อส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> ����อ��ลั��ารร�อ��อ��ี�ยว�ั�ส�า�ะว�า�/�ม�ว�า�"
+msgid "%s has replied to a free/busy request."
+msgstr "%s ����อ��ลั��ารร�อ��อ��ี�ยว�ั�ส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "�าร�อ�ส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "��อ�วามส�า�ะว�า�/�ม�ว�า��ิ��ลา�"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "��อ�วาม�ม�อยู���รู�����ี��หมาะสม"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "��อ�วามมี���ราย�ารร�อ��อ�ี��ม�รอ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "���ม����ม�มี��อ�วาม��ิ�ิ��ี�������"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "���ม����ม�มีราย�าร��ิ�ิ��ี�สามาร��ู���"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "�าร�รั���อมูล�สร��สม�ูร��\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "อ�อ�������ม��ู���อ� �ละ�ม�สามาร��รั���อมูล���\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "�ำ�อ��ี��ม����มา�า��ู�ร�วม�ระ�ุม�ั��ุ�ั�  �ะ��ิ�ม���า�����ู�ร�วม�ระ�ุมหรือ�ม�?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "�ม�สามาร��รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม��� ��ื�อ��า�ส�า�ะ������า�ี�����ม����!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "�รั���อมูล�ู����าร�วม�รีย�ร�อย�ล�ว\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1420
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "�ม�สามาร��รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม��� ��ื�อ��า�ราย�ารหาย���ล�ว"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "ส��ราย�าร���ล�ว!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "�ม�สามาร�ส��ราย�าร���!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "�ลือ���ิ�ั�ิ�าร:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "�รุ�า�อ��ลั�"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "�รั���อมูล"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "�อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "อา��อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "��ิ�ส�"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "ส����อมูล ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "�รั���อมูลส�า�ะ�าร�อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "ส����อมูลล�าสุ�"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "ย��ลิ�"
 
@@ -5501,72 +5321,72 @@ msgid "Resources"
 msgstr "�รั�ยา�ร"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "ส�ว��ุ��ล"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "�ลุ�ม"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "�รั�ยา�ร"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "ห�อ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "�ระ�า�"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "�ู�ร�วม�ระ�ุม�ี���อ����า"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "�ู�ร�วม�ระ�ุม�สริม"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "�ม�����ู�ร�วม�ระ�ุม"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "��อ��ำ��ิ��าร"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "�ู����าร�วม                           "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "�ำลั��ำ��ิ��าร"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2370
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Ey"
 
@@ -5575,7 +5395,7 @@ msgstr "%A %d %B %Ey"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2401
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Ey"
 
@@ -5585,67 +5405,63 @@ msgstr "%a %d/%m/%Ey"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "�ม�อยู��ี��ำ�า�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "�ม�มี��อมูล"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "�ู��_��า�ระ�ุม..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "_�ัว�ลือ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "�ส��_�ั�ว�ม��ำ�าร���า�ั��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "�ส��ภา��ยาย_ออ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_�รั��รุ���อมูล ว�า�/�ม�ว�า� "
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "�ลือ�_อั���มั�ิ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_�ุ��� �ุ��รั�ยา�ร"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "�ุ�_�� �ละ�รั�ยา�ร�ิ�����ิ��ห�ึ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "�ู����า�ระ�ุมห_ลั�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "�ู����า�ระ�ุมหลั� �ละ_�รั�ยา�ร�ิ�����ิ��ห�ึ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "�วลา�_ริ�ม���:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "�วลา_สิ��สุ�:"
 
@@ -5674,44 +5490,46 @@ msgid "Member"
 msgstr "สมา�ิ�"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../modules/calendar/e-cal-shell-content.c:467
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* �ม�มีสรุ� *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "�ริ�ม: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "�ำห���สร��: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "�ั��ั��ึ���วย�ำ�ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "�ั�ลอ��ั��ึ���วย�ำ�ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "��ะ�ั��ึ���วย�ำ�า��ลิ��อร��"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Delete selected memos"
 msgstr "ล��ั��ึ���วย�ำ�ี��ลือ�"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "�ลือ��ั��ึ���วย�ำ�ั��หม��ี�มอ��ห��"
 
@@ -5719,142 +5537,107 @@ msgstr "�ลือ��ั��ึ���วย�ำ�ั��หม�
 msgid "Click to add a memo"
 msgstr "�ลิ���ื�อ��ิ�ม�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:428
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "ภาร�ิ�"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "�ั�ภาร�ิ��ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "�ั�ลอ�ภาร�ิ��ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "��ะภาร�ิ��า��ลิ��อร��"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "ล�ภาร�ิ��ี��ลือ�"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "�ลือ�ภาร�ิ��ั��หม��ี�มอ��ห��"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "�ลือ�����วลา"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "มี�าร��ือ�"
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "มี�าร�วีย���ำ"
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "�����าร�ระ�ุม"
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "��ิ�ิ��ห�ุ�าร��: สรุ��ือ %s"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "��ิ�ิ��ห�ุ�าร��: �ม�มีราย�ารสรุ�"
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "�ห�ุ�าร���าร�ู��ิ�ิ�"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "ยึ����ัส"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "�ั�หมาย�หม�"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "�ห�ุ�าร���ลอ��ั��วั��หม�"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "�ระ�ุม�หม�"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "���ี�วั��ี�"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "��ยั�วั��ี�"
 
@@ -5892,42 +5675,42 @@ msgstr "รายสั��าห��ำ�า�: %s, %s"
 msgid "Day View: %s. %s"
 msgstr "รายวั�: %s, %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for a work week"
 msgstr "มุมมอ�สำหรั�ห�ึ��สั��าห��ำ�า�"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:206
 msgid "calendar view for one or more days"
 msgstr "มุมมอ���ิ�ิ�สำหรั�วั���ียวหรือหลายวั�"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "��ิ�ิ� Gnome"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:986
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Ey"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:993
-#: ../modules/calendar/e-cal-shell-view-private.c:999
-#: ../modules/calendar/e-cal-shell-view-private.c:1002
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Ey"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1030
-#: ../modules/calendar/e-cal-shell-view-private.c:1037
-#: ../modules/calendar/e-cal-shell-view-private.c:1040
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%d %b %Ey"
 
@@ -5949,15 +5732,15 @@ msgstr "ราย��ือ�: %s. %s"
 msgid "Week View: %s. %s"
 msgstr "รายสั��าห�: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "��ิ�ิ�สำหรั�ห�ึ����ือ�"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "��ิ�ิ��ูภาย�� 1 สั��าห� หรือมา��ว�า"
 
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:2239
 msgid "Purging"
 msgstr "�ำลั������วา�"
 
@@ -6010,39 +5793,40 @@ msgid "Select Date"
 msgstr "�ลือ�วั��ี�"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "�ั�ยาย�"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "�ลือ�_วั��ี�"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "�ลือ�_วั��ี�"
+msgid "September"
+msgstr "�ั�ยาย�"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "��อ��ำห���ู��ระสา��า���วย"
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "��อ�มี�ู����าร�วม�ระ�ุมอย�า���อยห�ึ����"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "��อมูล�ห�ุ�าร��"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "��อมูลภาร�ิ�"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "��อมูล�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "��อมูล ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "��อมูล��ิ�ิ�"
 
@@ -6050,7 +5834,7 @@ msgstr "��อมูล��ิ�ิ�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "�อ�รั��ล�ว"
@@ -6059,7 +5843,7 @@ msgstr "�อ�รั��ล�ว"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "อา��อ�รั�"
@@ -6071,7 +5855,7 @@ msgstr "อา��อ�รั�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "��ิ�ส�"
@@ -6080,7 +5864,7 @@ msgstr "��ิ�ส�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ส���ู�������า�ระ�ุม"
@@ -6088,7 +5872,7 @@ msgstr "ส���ู�������า�ระ�ุม"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "��ิ�ม��ิม"
@@ -6096,7 +5880,7 @@ msgstr "��ิ�ม��ิม"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ย��ลิ�"
@@ -6104,7 +5888,7 @@ msgstr "ย��ลิ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ล�าสุ�"
@@ -6112,29 +5896,29 @@ msgstr "ล�าสุ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "�ส�อ�ย��"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "��อมูล ว�า�/�ม�ว�า� (%s ��ยั� %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "��อมูล iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "�ม�สามาร��อ��รั�ยา�ร��� ��ื�อ��า��ห�ุ�าร���หม����ั��ห�ุ�าร��อื��"
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "�ม�สามาร��อ��รั�ยา�ร��� ��อ�ิ��ลา�: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "�ุ���อ������ู����าร�วม���ห�ุ�าร��"
 
@@ -6290,49 +6074,73 @@ msgstr "ศ."
 msgid "Sa"
 msgstr "ส."
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "�ั�หมาย"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " �ึ� "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "ภาร�ิ�"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr "(�สร�� "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "�สร�� "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr " (�ำห���สร�� "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "�ำห���สร�� "
+
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "สรุ�: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "�ู����า�ระ�ุม: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "ส�า�ะ: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "ระ�ั��วามสำ�ั�: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "��อร��������ี��สร��: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "หมว�: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "�ู��ิ���อ:"
 
@@ -6357,44 +6165,189 @@ msgstr "มา��ว�า"
 msgid "is less than"
 msgstr "��อย�ว�า"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "�ั�หมาย�ละ�าร�ระ�ุม"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1832
 msgid "Opening calendar"
 msgstr "�ำลั���ิ���ิ�ิ�"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "���ม iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "��รื�อ�มือ�ำ���า iCalendar �อ� Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "��ือ��วาม�ำ!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "���ม vCalendar (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "���ม vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "��รื�อ�มือ�ำ���า vCalendar �อ� Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "�ห�ุ�าร�������ิ�ิ�"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "��รื�อ�มือ�ำ���า��อมูลอั��ริยะสำหรั���ิ�ิ��อ� Evolution"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "�าร�ระ�ุม"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "�ห�ุ�าร��"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "ภาร�ิ�"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "�ั��ึ���วย�ำ"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "มี�าร�วีย���ำ"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "�����ร�ีห�ึ��"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "มี�าร��ือ�"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "มี���ม���"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "��ิ���ย"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "ส�ว��ัว"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "�����วามลั�"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "�ระ�ภ�"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "สรุ�"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "ส�า��ี�"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "�ริ�ม"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "�ึ��ำห��"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "สิ��สุ�"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "หมว�"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "�สร���ล�ว"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "�ู��ระสา��า�"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "�ู����า�ระ�ุม"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "�ำ�รรยาย"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "��ิ�"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -7944,198 +7897,175 @@ msgstr "���ิ�ิ�/วาลลิส"
 msgid "Pacific/Yap"
 msgstr "���ิ�ิ�/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "��หมาย�ม�มี�ื�อ�รื�อ�"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "�ั��ึ�����..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:329
 msgid "Attach a file"
 msgstr "������ม"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "�ิ_�"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "�ิ����ม�ั��ุ�ั�"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_�ิม��..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "�ัวอ_ย�า���อ��ิม��"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "�ั��ึ����ม�ั��ุ�ั�"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "�ั��ึ��_���..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "�ั��ึ����ม�ั��ุ�ั����ื�ออื��"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "�ั��ึ�������ั�_ร�า�"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "�ั��ึ�������ั�ร�า�"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:290
 msgid "S_end"
 msgstr "_ส��"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "ส����อ�วาม�ี�"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "_��อ�วาม�หม�"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "��ิ�ห��า��า���อ�วาม�หม�"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "รหัส_อั��ระ"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "�_��ารหัส PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
-msgstr "���ารหัส��อ�วาม�ี���วย PGP"
+msgstr "���ารหัสลั���อ�วาม�ี���วย PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "�_��� PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "�����ำ�ั���อ�วาม�ี���วย�ุ��� PGP �อ��ุ�"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "�ั�_ลำ�ั��วามสำ�ั��อ���อ�วาม"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "�ำห��ลำ�ั��วามสำ�ั��อ���อ�วาม����สำ�ั�สู�"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "ร�อ�_�อ�าร����รั���อ�วาม"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "รั��าร�����มื�อ��อ�วาม�อ��ุ��ู���ิ�อ�า�"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "���า_รหัส S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "���ารหัส��อ�วาม�ี���วย�าร�รว�สอ��าร���ารหัส S/MIME �อ��ุ�"
+msgstr "���ารหัสลั���อ�วาม�ี���วย��รั�รอ��าร���ารหัสลั� S/MIME �อ��ุ�"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "���_� S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�����ำ�ั���อ�วาม�ี���วย��รั�รอ�ลาย���� S/MIME �อ��ุ�"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "��อ�สำ��า_ลั��ึ�"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "��อ�/�ส����อ� สำ��าลั��ึ� (BCC)"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "��อ�_สำ��า�ึ�"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "��อ�/�ส����อ� สำ��า�ึ� (CC)"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "��อ�_�า�"
-
 #: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "��อ�/�ส���ัว�ลือ��ู�ส��"
-
-#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "��อ�_�ี�อยู��อ��ลั�"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "��อ�/�ส����อ� �ี�อยู��อ��ลั� (Reply-To)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:472
 msgid "Save Draft"
 msgstr "�ั��ึ���ั�ร�า�"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "�ส��"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "��อ�"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "��อ��ื�อ�ู�รั���หมาย"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��อ��ี�อยู��ี��ะส��สำ��า��หมาย"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "��อ��ี�อยู��ี��ะส��สำ��า��หมาย��ย�ม��ส����ราย�ื�อ�ู�รั��อ���หมาย�ั��"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:961
 msgid "Fr_om:"
 msgstr "_�า�:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "�า�"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:970
 msgid "_Reply-To:"
 msgstr "_�ี�อยู��อ��ลั�:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:974
 msgid "_To:"
 msgstr "_�ึ�:"
 
@@ -8143,88 +8073,78 @@ msgstr "_�ึ�:"
 msgid "_Cc:"
 msgstr "_สำ��า�ึ�:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "สำ��า_ลั��ึ�:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_�ระ�าศ�ี�:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "�_รื�อ�:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "ลาย���_�:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "�ลิ��ี��ี���า��อ��ารสมุ��ี�อยู�"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "�ลิ��ี��ี���ื�อ�ลือ���ล��อร��ี��ะ�ระ�าศ"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:208
 msgid "Undo the last action"
 msgstr "�รีย��ื��าร�ระ�ำล�าสุ�"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:212
 msgid "Redo the last undone action"
 msgstr "�ำ��ำ�าร�ระ�ำ�ี��รีย��ื�ล�าสุ�"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:216
 msgid "Search for text"
 msgstr "���หา��อ�วาม"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:220
 msgid "Search for and replace text"
 msgstr "���หา�ละ����ี���อ�วาม"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:310
 msgid "Save draft"
 msgstr "�ั��ึ���ั�ร�า�"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:186
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "�_ม���อ��ส����อ�วาม�ี�อี�"
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1003
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "�ม�สามาร������ำ�ั���อ�วาม�าออ�: �ม�����ำห����รั�รอ��าร�����ำ�ั�สำหรั��ั��ี�ี�"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1010
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "�ม�สามาร����ารหัสลั���อ�วาม�าออ�: �ม�����ำห����รั�รอ��าร���ารหัสลั�สำหรั��ั��ี�ี�"
 
-#: ../composer/e-msg-composer.c:1381
+#: ../composer/e-msg-composer.c:1403
 msgid "Unable to reconstruct message from autosave file"
 msgstr "�ม�สามาร�สร�า���อ�วาม�ลั��ื��า����ม�ั��ึ�อั���มั�ิ���"
 
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
+#: ../composer/e-msg-composer.c:1469 ../composer/e-msg-composer.c:1676
 msgid "Compose Message"
 msgstr "��ีย���หมาย"
 
-#: ../composer/e-msg-composer.c:3312
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr "<b>(��อ���ีย���หมายมี��ื�อหา�ี��ม������อ�วาม �ึ���ม�สามาร���������)</b>"
+#: ../composer/e-msg-composer.c:3331
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr "��อ���ีย���หมายมี��ื�อหา�ี��ม������อ�วาม �ึ���ม�สามาร���������"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8303,7 +8223,7 @@ msgstr ""
 "�าร�รีย��ื��ะ��วย�ห��ุ���ีย���อ�า��รั���ี��ล�ว���"
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "���ม '{0}' �ม�������ม���ิ �ละ�ม�สามาร�ส��������หมาย"
 
 #: ../composer/mail-composer.error.xml.h:17
@@ -8322,8 +8242,8 @@ msgid "Unable to activate the address selector control."
 msgstr "�ม�สามาร��รีย����วิ������ลือ��ี�อยู����"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "�ุ��ม�สามาร�������ม `{0}' ���ั���หมาย�ี�"
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "�ุ��ม�สามาร�������ม '{0}' ���ั���หมาย�ี�"
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8366,64 +8286,79 @@ msgstr "��อ�����"
 msgid "Anjal email client"
 msgstr "��ร��รมอ�า�-��ีย��มล Anjal"
 
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "�รุ�า��อ��ื�อ���ม�อ��ุ�"
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "�รุ�า��อ��ี�อยู�อี�มล�อ��ุ�"
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "�ี�อยู�อี�มล�ี��ุ���อ��ั���ิ�รู����"
 
-#: ../capplet/settings/mail-account-view.c:181
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">รายละ�อีย���อมูลส�ว��ุ��ล:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "�รุ�า��อ�รหัส��า��อ��ุ�"
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "�ู��ิล"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "รายละ�อีย�ส�ว��ุ��ล:"
 
-#: ../capplet/settings/mail-account-view.c:186
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "�ื�อ:"
 
-#: ../capplet/settings/mail-account-view.c:195
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "�ี�อยู�อี�มล:"
 
-#: ../capplet/settings/mail-account-view.c:205
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">รายละ�อีย��ารรั�:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">รายละ�อีย�:</span>"
 
-#: ../capplet/settings/mail-account-view.c:210
-#: ../capplet/settings/mail-account-view.c:258
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">�ารรั�</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "��ิ���ิร���วอร�:"
 
-#: ../capplet/settings/mail-account-view.c:219
-#: ../capplet/settings/mail-account-view.c:267
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "�ี�อยู���ิร���วอร�:"
 
-#: ../capplet/settings/mail-account-view.c:228
-#: ../capplet/settings/mail-account-view.c:276
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "�ื�อ�ู����:"
 
-#: ../capplet/settings/mail-account-view.c:237
-#: ../capplet/settings/mail-account-view.c:285
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "����าร���ารหัสลั�:"
 
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:290
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "�ม����"
 
-#: ../capplet/settings/mail-account-view.c:253
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">รายละ�อีย��ารส��:</span>"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">�ารส��</span>"
 
-#: ../capplet/settings/mail-account-view.c:309
+#: ../capplet/settings/mail-account-view.c:585
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8433,7 +8368,7 @@ msgstr ""
 "�ล�ว�รา�ะ�ยายาม�ั����า��า�� �ห� ��า�รา�ม�สามาร��ั����า���อั���มั�ิ��� "
 "�ุ����ะ��อ���อ�รายละ�อีย��อ���ิร���วอร��อ��ุ���วย"
 
-#: ../capplet/settings/mail-account-view.c:311
+#: ../capplet/settings/mail-account-view.c:587
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8442,11 +8377,11 @@ msgstr ""
 "�ออภัย �รา�ม�สามาร��ั����า�ห��ั��มล�อ��ุ���ยอั���มั�ิ��� �รุ�า��อ���า��า�� �ี���า�ล�า��ี� "
 "�รา�����ิม��า�ั������า�รายละ�อีย��ี��ุ���อ��ว��ล�ว ����ุ�อา���อ���ลี�ย���า��า�� อี��ี"
 
-#: ../capplet/settings/mail-account-view.c:313
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "�ุ�สามาร�ระ�ุ�ัว�ลือ���ิ�ม��ิม��ื�อ�ั����า�ั��ี���"
 
-#: ../capplet/settings/mail-account-view.c:315
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8454,11 +8389,11 @@ msgstr ""
 "�ี�ี� �รา��อ��าร��า��า�� �อ��ุ���ื�อ���ส���มล �รา����ยายาม��า��า�า�อย�า��ว��ล�ว "
 "����ุ��วร�รว�สอ���า�หล�า�ั����ื�อ�วาม�����"
 
-#: ../capplet/settings/mail-account-view.c:316
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "�ุ�สามาร�ระ�ุ��า�ริยาย��า�� สำหรั��ั��ี�อ��ุ����"
 
-#: ../capplet/settings/mail-account-view.c:317
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8466,86 +8401,125 @@ msgstr ""
 "����วลา�รว�สอ��วาม�รีย�ร�อย�อ��ุ�สิ���ุ�อย�า� "
 "��อ��ี��รา�ะ�ยายาม��ื�อม��อ��ยั���ิร���วอร��ละ�ึ��มล�อ��ุ�มา"
 
-#: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2086 ../mail/em-account-editor.c:2217
+#: ../mail/mail-config.ui.h:60
 msgid "Identity"
 msgstr "��อมูล�ุ��ล"
 
-#: ../capplet/settings/mail-account-view.c:332
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "�ั����อ�� - �ารรั��มล"
 
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "�ารรั��มล"
 
-#: ../capplet/settings/mail-account-view.c:333
-#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "�ั����อ�� - �ารส���มล"
 
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "ย�อ��ื� - ��อมูล�ุ��ล"
 
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "�ั����อ�� - �ัว�ลือ��ารรั��มล"
 
-#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "�ัว�ลือ��ารรั��มล"
 
-#: ../capplet/settings/mail-account-view.c:334
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "ย�อ��ื� - �ารรั��มล"
 
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "�ารส���มล"
 
-#: ../capplet/settings/mail-account-view.c:336
-#: ../capplet/settings/mail-account-view.c:337
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "�ั����อ�� - �รว��า��ั��ี"
 
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "�ั����อ�� - ��า�ริยาย"
 
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "ย�อ��ื� - �ัว�ลือ��ารรั��มล"
 
-#: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2791 ../mail/mail-config.ui.h:33
 msgid "Defaults"
 msgstr "��า�ริยาย"
 
-#: ../capplet/settings/mail-account-view.c:337
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "ย�อ��ื� - �ารส���มล"
 
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "�รว��า��ั��ี"
 
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "�สร��สิ��"
 
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "ย�อ��ื� - �ารส���มล"
 
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:719
+msgid "Setup Google contacts with Evolution"
+msgstr "�ั����า�ู��ิ���อ�ู��ิล ��ื�อ����ั� Evolution"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Setup Google calendar with Evolution"
+msgstr "�ั����า��ิ�ิ��ู��ิล ��ื�อ����ั� Evolution"
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "�ุ�อา���อ���ิ�����าร���า�ึ� IMAP"
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">�ั����า�ั��ี�ู��ิล:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "�ั����า��ิ�ิ�ยาฮู ��ื�อ����ั� Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">�ั����า�ั��ียาฮู:</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "�ื�อ��ิ�ิ�ยาฮู:"
+
+#: ../capplet/settings/mail-account-view.c:1023
+msgid "Password:"
+msgstr "รหัส��า�:"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "�ิ�����"
 
-#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "��รื�อ�มือ��วยสร�า��ั��ี"
 
@@ -8554,20 +8528,21 @@ msgid "Evolution account assistant"
 msgstr "��รื�อ�มือ��วย�ั����า�ั��ี Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1614
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1608
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-backend.c:133
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "���อม�ิว��อร��ี�"
 
@@ -8580,11 +8555,11 @@ msgstr "��ลี�ย���ล�"
 msgid "Add a new account"
 msgstr "��ิ�ม�ั��ี�หม�"
 
-#: ../capplet/settings/mail-settings-view.c:183
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">�าร�ั��าร�ั��ี</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "�าร�ั��าร�ั��ี�ู����"
 
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "��า�ั��"
 
@@ -8596,7 +8571,7 @@ msgstr "�าร�����ห�ุ�าร����ิ�ิ�"
 msgid "Evolution Alarm Notify"
 msgstr "��รื�อ�มือ������ือ� �อ� Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:825
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:824
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8621,14 +8596,6 @@ msgstr "�ั����า�ั��ีอี�มล"
 msgid "Email Settings"
 msgstr "�ั����าอี�มล"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "�าม�ั�ร�ี�อยู�"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "��อมูล��ิ�ิ�"
-
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
 #, c-format
@@ -8722,33 +8689,37 @@ msgstr "ยุ�ร��ะวั���"
 msgid "Western European, New"
 msgstr "ยุ�ร��ะวั���, �หม�"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "�ัว���ม"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "�ัวย�อ"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "ยู��ร�"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "��าย���วา"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "วั��ี�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "�รุ���ี�"
 
@@ -8756,22 +8727,28 @@ msgstr "�รุ���ี�"
 msgid "Yesterday"
 msgstr "�มื�อวา�"
 
-#: ../e-util/e-datetime-format.c:210
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "อี� %d วั�"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "อี� %d วั�"
+msgstr[1] "อี� %d วั�"
 
-#: ../e-util/e-datetime-format.c:212
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "%d วั���อ�"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d วั���อ�"
+msgstr[1] "%d วั���อ�"
 
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "�����า�ริยาย�อ��ล��ล"
 
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "รู����:"
 
@@ -8792,18 +8769,6 @@ msgstr "�ำลั���ีย� \"%s\""
 msgid "Writing \"%s\" to %s"
 msgstr "�ำลั���ีย� \"%s\" ��ยั� %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "�ื�อ�อ���รื�อ�มือ�ั��ึ��ูม"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "�ื�อ���ม"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "�ื�อ���ม�อ��ัวมอ�ูล"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "�ั��ึ�สำหรั��าร�ี�ั��"
@@ -8826,13 +8791,15 @@ msgstr "��อ�วาม�ั��ึ�:"
 msgid "Log Level"
 msgstr "ระ�ั��าร�ั��ึ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2690
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "��อ�วาม"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1464
+#: ../shell/e-shell-window-actions.c:1471
 msgid "Close this window"
 msgstr "�ิ�ห��า��า��ี�"
 
@@ -8856,19 +8823,8 @@ msgstr "��อ�วาม�ี�ั��"
 msgid "Error, Warnings and Debug messages"
 msgstr "��อ�ิ��ลา� �ำ��ือ� �ละ��อ�วาม�ี�ั��"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "��ิ�����า�"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "ระ�ุว�า�ลั��อิ���ิ�����า�อยู�หรือ�ม�"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "สั��าห�"
@@ -8890,7 +8846,7 @@ msgstr "ระ���าร�ิม���ม����ราย�า�
 msgid "Autogenerated"
 msgstr "สร�า���ยอั���มั�ิ"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "��ื�อ��า� \"{1}\""
 
@@ -8910,235 +8866,241 @@ msgstr "�ุ���อ��าร��ีย��ั����หรื
 msgid "File exists \"{0}\"."
 msgstr "มี���ม \"{0}\" อยู���อ��ล�ว"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "�_�ีย��ั�"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:170
 msgid "Could not open the link."
 msgstr "�ม�สามาร���ิ�ลิ���"
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:220
 msgid "Could not display help for Evolution."
 msgstr "�ม�สามาร��ส��วิ�ี���สำหรั� Evolution"
 
-#: ../e-util/gconf-bridge.c:1307
+#: ../e-util/gconf-bridge.c:1281
 #, c-format
 msgid "GConf error: %s"
 msgstr "��อ�ิ��ลา��� GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1292
 msgid "All further errors shown only on terminal."
 msgstr "รายละ�อีย���อ�ิ��ลา�อื��� อยู�����อร�มิ�ัล���า�ั��"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "�า�"
+
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "�ี�อยู��อ��ลั�"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2277 ../mail/em-format-html.c:2339
+#: ../mail/em-format-html.c:2362 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "สำ��า�ึ�"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2278 ../mail/em-format-html.c:2343
+#: ../mail/em-format-html.c:2365 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "สำ��าลั��ึ�"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "�รื�อ�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2459
+#: ../modules/mail/em-mailer-prefs.c:1139
 msgid "Mailer"
 msgstr "��ร��รมส���มล"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1193
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ��อ�วามส����อ --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "วั��ี�"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "�ลุ�ม��าว"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "รู���าย"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "���ม��� %s"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "�ม�สามาร������อ�วาม S/MIME: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�ม�สามาร������อ�วาม MIME �ะ�ส����อ�วาม�����ั�"
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "��ิ��าร���ารหัสลั��ี��ม�รอ�รั�สำหรั� multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "�ม�สามาร������อ�วาม PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "�ม�สามาร������อ�วาม PGP/MIME: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "รู����ลาย�����ี��ม�รอ�รั�"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "��ิ���อ�ิ��ลา���ะ�รว�สอ�ลาย����"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ��ะ�รว�สอ�ลาย����"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "�ม�สามาร������อ�วาม PGP"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "�ม�สามาร������อ�วาม PGP: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 วิ�า�ี��อ�"
 msgstr[1] "%d วิ�า�ี��อ�"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 วิ�า�ี��า�ห��า"
 msgstr[1] "%d วิ�า�ี��า�ห��า"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 �า�ี��อ�"
 msgstr[1] "%d �า�ี��อ�"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 �า�ี��า�ห��า"
 msgstr[1] "%d �า�ี��า�ห��า"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 �ั�ว�ม���อ�"
 msgstr[1] "%d �ั�ว�ม���อ�"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 �ั�ว�ม���า�ห��า"
 msgstr[1] "%d �ั�ว�ม���า�ห��า"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 วั���อ�"
 msgstr[1] "%d วั���อ�"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 วั���า�ห��า"
 msgstr[1] "%d วั���า�ห��า"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 สั��าห���อ�"
 msgstr[1] "%d สั��าห���อ�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 สั��าห���า�ห��า"
 msgstr[1] "%d สั��าห���า�ห��า"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 ��ือ���อ�"
 msgstr[1] "%d ��ือ���อ�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 ��ือ���า�ห��า"
 msgstr[1] "%d ��ือ���า�ห��า"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 �ี��อ�"
 msgstr[1] "%d �ี��อ�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 �ี��า�ห��า"
 msgstr[1] "%d �ี��า�ห��า"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<�ลิ��ี��ี���ื�อ�ลือ�วั��ี�>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "��ะ�ี�"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Ey"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "�ลือ��วลา�ี��ะ���������า��รีย���ีย�"
 
@@ -9191,11 +9153,11 @@ msgid "I_nclude threads"
 msgstr "_รวม�ระ�ู���วย"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "���า"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "ออ�"
 
@@ -9227,7 +9189,7 @@ msgstr "�ม�มีวั��ี�"
 msgid "Missing file name."
 msgstr "�ม�มี�ื�อ���ม"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "�ม�มี�ื�อ"
 
@@ -9304,7 +9266,7 @@ msgstr "��า�ห��า"
 msgid "months"
 msgstr "��ือ�"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:180
 msgid "seconds"
 msgstr "วิ�า�ี"
 
@@ -9320,44 +9282,28 @@ msgstr "�วลา�ี��ุ�ระ�ุ"
 msgid "years"
 msgstr "�ี"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1028 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "���ม���"
 msgstr[1] "���ม���"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "มุมมอ��อ�อ�"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "มุมมอ�ราย�ื�อ"
 
-#: ../mail/e-mail-browser.c:769 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "�ัว�ิ��าม���ัส"
-
-#: ../mail/e-mail-browser.c:779
-msgid "Shell Module"
-msgstr "มอ�ูล��ลล�"
-
-#: ../mail/e-mail-browser.c:780 ../mail/message-list.c:2580
-msgid "The mail shell backend"
-msgstr "�����อ�����ลล��อ��มล"
-
-#: ../mail/e-mail-browser.c:790
-msgid "Show Deleted"
-msgstr "�ส���ี�ล����ล�ว"
-
-#: ../mail/e-mail-browser.c:791
-msgid "Show deleted messages"
-msgstr "�ส����อ�วาม�ี�ล����ล�ว"
+#: ../mail/e-mail-browser.c:264
+msgid "(No Subject)"
+msgstr "(�ม�มีหัว�รื�อ�)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9404,7 +9350,7 @@ msgid "_Later"
 msgstr "�ว��ีห_ลั�"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "��ิ�ม��าย"
 
@@ -9424,114 +9370,57 @@ msgstr ""
 msgid "Color"
 msgstr "สี"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2671
-#: ../modules/mail/e-mail-shell-view-private.c:964
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "�ื�อ"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:706 ../mail/em-folder-tree.c:2729
+#: ../modules/mail/e-mail-shell-view-private.c:956
 msgid "Inbox"
 msgstr "��หมาย���า"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:699
 msgid "Drafts"
 msgstr "��หมายร�า�"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:709
 msgid "Outbox"
 msgstr "��หมายออ�"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:711
 msgid "Sent"
 msgstr "ส���ล�ว"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:702
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:572
 msgid "Templates"
 msgstr "�ม����"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "สำ�ั�"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "�ะ�ำ"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "�ว��ีหลั�"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "�ำลั�ย�าย��อมูล..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "�ารย�าย��อมูล"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "�ำลั�ย�าย��อมูล '%s':"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "�ม�สามาร�สร�า���ล��อร��หม� `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "�ม�สามาร��ั�ลอ���ล��อร� `%s' ��ยั� `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "�ม�สามาร��รว�หา�ล�อ��มล�ี�มีอยู��ี� `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:643
 msgid "Migrating Folders"
 msgstr "�ำลั�ย�าย��อมูล��ล��อร���า��"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ำ�ห����ละ��ร�สร�า��อ���ล��อร��ล�อ��มล�อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
-"\n"
-"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "�ม�สามาร���ิ���อมูล POP ���า `%s' ��ิ������ว��ี���ิร���วอร�: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "�ม�สามาร�สร�า����ร��อรี��อมูล POP3 `%s' ��ิ������ว��ี���ิร���วอร�: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "�ม�สามาร��ั�ลอ���อมูล POP3 `%s' ��ิ������ว��ี���ิร���วอร�: %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "�ม�สามาร�สร�า��ี������มล��อ��ิ�� `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:644
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9543,45 +9432,36 @@ msgstr ""
 "\n"
 "�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
 
-#: ../mail/e-mail-migrate.c:3030
+#: ../mail/e-mail-migrate.c:740
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "�ม�สามาร�สร�า���ล��อร��มล��อ��ิ�� `%s': %s"
-
-#: ../mail/e-mail-migrate.c:3048
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"�ม�สามาร�อ�า���า�ั���า��าร�ิ��ั���รั����อ��อ� Evolution �ม�มี���ม `evolution/config.xmldb' "
-"หรือ���ม�สียหาย"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "�ม�สามาร�สร�า���ล��อร��มล����รื�อ��ี� '%s': %s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "�ม���อ��ามอี�"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:260 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "�ั�ลอ���ยั���ล��อร�"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:260 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "_�ั�ลอ�"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:634 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ย�าย��ยั���ล��อร�"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:634 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_ย�าย"
 
-#: ../mail/e-mail-reader.c:864
+#: ../mail/e-mail-reader.c:860
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "�ั��ึ���อ�วาม"
@@ -9593,539 +9473,538 @@ msgstr[1] "�ั��ึ���อ�วาม"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:881 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "��อ�วาม"
 msgstr[1] "��อ�วาม"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1139
 msgid "A_dd Sender to Address Book"
 msgstr "�_�ิ�ม�ู�ส����สมุ��ี�อยู�"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1141
 msgid "Add sender to address book"
 msgstr "��ิ�ม�ู�ส����สมุ��ี�อยู�"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1146
 msgid "Check for _Junk"
 msgstr "�รว��มล_�ยะ"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1148
 msgid "Filter the selected messages for junk status"
 msgstr "�รอ���อ�วาม�ี��ลือ�สำหรั�ส�า�ะ�มล�ยะ"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1153
 msgid "_Copy to Folder..."
 msgstr "_�ั�ลอ���ยั���ล��อร�..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1155
 msgid "Copy selected messages to another folder"
 msgstr "�ั�ลอ���อ�วาม�ี��ลือ���ยั���ล��อร�อื��"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1160
 msgid "_Delete Message"
 msgstr "_ล���อ�วาม"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1162
 msgid "Mark the selected messages for deletion"
 msgstr "�ำ��รื�อ�หมาย��ื�อล���อ�วาม�ี��ลือ�"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1167
 msgid "Filter on Mailing _List..."
 msgstr "�รอ��ี��_มลลิ�ลิส��..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1169
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "สร�า�����ื�อ�รอ���อ�วาม��ยั��มลลิ�ลิส���ี�"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1174
 msgid "Filter on _Recipients..."
 msgstr "�รอ��ี��ื�อ�ู�_รั�..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1176
 msgid "Create a rule to filter messages to these recipients"
 msgstr "สร�า�����ื�อ�รอ���อ�วาม��ยั��ู�รั��หล�า�ี�"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1181
 msgid "Filter on Se_nder..."
 msgstr "�รอ��ี��ู�_ส��..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1183
 msgid "Create a rule to filter messages from this sender"
 msgstr "สร�า�����ื�อ�รอ���อ�วาม�า��ู�ส���ี�"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1188
 msgid "Filter on _Subject..."
 msgstr "�รอ��ี��ื�อ�_รื�อ�..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1190
 msgid "Create a rule to filter messages with this subject"
 msgstr "สร�า�����ื�อ�รอ���อ�วาม��วย�ื�อ�รื�อ��ี�"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1195
 msgid "A_pply Filters"
 msgstr "_��อ����า�ัว�รอ�"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1197
 msgid "Apply filter rules to the selected messages"
 msgstr "������าร�รอ��รอ���อ�วาม�ี��ลือ�"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1202
 msgid "_Find in Message..."
 msgstr "_หา����อ�วาม..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1204
 msgid "Search for text in the body of the displayed message"
 msgstr "���หา��อ�วาม���ัว��อ�วาม�ี��ส��อยู�"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1209
 msgid "_Clear Flag"
 msgstr "_ล�า���"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1211
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "�อา���าม�ระ�ู�ออ��า���อ�วาม�ี��ลือ�"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1216
 msgid "_Flag Completed"
 msgstr "_�ั���ว�า�สร���ล�ว"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1218
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "�ั����าม�ระ�ู�����อ�วาม�ี��ลือ�ว�า�สร���ล�ว"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1223
 msgid "Follow _Up..."
 msgstr "�ิ�_�าม�ระ�ู�..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1225
 msgid "Flag the selected messages for follow-up"
 msgstr "�ั����ี���อ�วาม�ี��ลือ���ื�อ�าม�ระ�ู�"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1230
 msgid "_Attached"
 msgstr "�_��"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1232 ../mail/e-mail-reader.c:1239
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ส����อ��อ�วาม�ี��ลือ���ยั��ู�อื���������ม���"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1237
 msgid "Forward As _Attached"
 msgstr "ส����อ�������ม�_��"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1244
 msgid "_Inline"
 msgstr "�_���อ�วาม"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1246 ../mail/e-mail-reader.c:1253
 msgid "Forward the selected message in the body of a new message"
 msgstr "ส����อ��อ�วาม�ี��ลือ���ย������ื�อหา����อ�วาม�ี�ส��"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1251
 msgid "Forward As _Inline"
 msgstr "ส����อ����_��อ�วาม"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1258
 msgid "_Quoted"
 msgstr "อ�า�_�ำ�ู�"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1260 ../mail/e-mail-reader.c:1267
 msgid "Forward the selected message quoted like a reply"
 msgstr "ส����อ��อ�วาม�ี��ลือ���ยอ�า��ำ�ู��หมือ��าร�อ�"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1265
 msgid "Forward As _Quoted"
 msgstr "ส����อ�����าร_อ�า��ำ�ู�"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1272
 msgid "_Load Images"
 msgstr "�_หล�ภา�"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1274
 msgid "Force images in HTML mail to be loaded"
 msgstr "�ั��ั��ห��หล�รู�ภา����มล HTML �ั��หม�"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1279
 msgid "_Important"
 msgstr "_สำ�ั�"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1281
 msgid "Mark the selected messages as important"
 msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า������อ�วามสำ�ั�"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1286
 msgid "_Junk"
 msgstr "�มล_�ยะ"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1288
 msgid "Mark the selected messages as junk"
 msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า�����มล�ยะ"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1293
 msgid "_Not Junk"
 msgstr "�ม�����มล_�ยะ"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1295
 msgid "Mark the selected messages as not being junk"
 msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า�ม�����มล�ยะ"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1300
 msgid "_Read"
 msgstr "_อ�า��ล�ว"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1302
 msgid "Mark the selected messages as having been read"
 msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ���ื�อ�ส��ว�า���อ�า��ล�ว"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1307
 msgid "Uni_mportant"
 msgstr "�_ม�สำ�ั�"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1309
 msgid "Mark the selected messages as unimportant"
 msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า������อ�วาม�ม�สำ�ั�"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1314
 msgid "_Unread"
 msgstr "_ยั��ม����อ�า�"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1316
 msgid "Mark the selected messages as not having been read"
 msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�ายั��ม����อ�า�"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1321
 msgid "_Edit as New Message..."
 msgstr "�_����������อ�วาม�หม�..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1323
 msgid "Open the selected messages in the composer for editing"
 msgstr "��ิ���อ�วาม�ี��ลือ���ห��า��า���ีย���หมาย��ื�อ�����"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1328
 msgid "Compose _New Message"
 msgstr "��ีย�_��อ�วาม�หม�"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1330
 msgid "Open a window for composing a mail message"
 msgstr "��ิ�ห��า��า�สำหรั��าร��ีย���อ�วาม�มล"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1335
 msgid "_Open in New Window"
 msgstr "��ิ���_ห��า��า��หม�"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1337
 msgid "Open the selected messages in a new window"
 msgstr "��ิ���อ�วาม�ี��ลือ���ห��า��า��หม�"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1342
 msgid "_Move to Folder..."
 msgstr "_ย�าย��ยั���ล��อร�..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1344
 msgid "Move selected messages to another folder"
 msgstr "ย�าย��อ�วาม�ี��ลือ���ยั���ล��อร�อื��"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1349
 msgid "_Next Message"
 msgstr "��อ�วาม_�ั���"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1351
 msgid "Display the next message"
 msgstr "�ส����อ�วาม�ั���"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1356
 msgid "Next _Important Message"
 msgstr "��อ�วาม_สำ�ั��ั���"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1358
 msgid "Display the next important message"
 msgstr "�ส����อ�วาม�ี�สำ�ั��ั���"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1363
 msgid "Next _Thread"
 msgstr "_�ระ�ู��ั���"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1365
 msgid "Display the next thread"
 msgstr "�ส���ระ�ู��ั���"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1370
 msgid "Next _Unread Message"
 msgstr "��อ�วาม�ี�ยั��ม����อ�า�_�ั���"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1372
 msgid "Display the next unread message"
 msgstr "�ส����อ�วาม�ั����ี�ยั��ม�อ�า�"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1377
 msgid "_Previous Message"
 msgstr "��อ�วาม_��อ�ห��า"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1379
 msgid "Display the previous message"
 msgstr "�ส����อ�วาม��อ�ห��า"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1384
 msgid "Pr_evious Important Message"
 msgstr "��อ�วามสำ�ั�_��อ�ห��า"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1386
 msgid "Display the previous important message"
 msgstr "�ส����อ�วามสำ�ั���อ�ห��า"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1391
 msgid "P_revious Unread Message"
 msgstr "��อ�วาม�ี�ยั��ม����อ�า�_��อ�ห��า"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1393
 msgid "Display the previous unread message"
 msgstr "�ส����อ�วาม�ี�ยั��ม�อ�า���อ�ห��า"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1400
 msgid "Print this message"
 msgstr "�ิม����อ�วาม�ี�"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1407
 msgid "Preview the message to be printed"
 msgstr "�ู�ัวอย�า���อ�วาม��อ��ิม��"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1412
 msgid "Re_direct"
 msgstr "��ลี�ย��_ส���า�"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1414
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "��ลี�ย��ส���า� (bounce) ��อ�วาม�ี��ลือ���ยั��ู�อื��"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "�อ��ลั��ั��ห_ม�"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1421
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "��ีย��มล�อ���ยั��ู�รั��ุ����อ���อ�วาม�ี��ลือ�อยู�"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1426
 msgid "Reply to _List"
 msgstr "�อ��ลั����า_ลิส��"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1428
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "��ีย��มล�อ���ยั��มลลิ�ลิส���อ���อ�วาม�ี��ลือ�อยู�"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1433
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_�อ��ลั��ู�ส��"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1435
 msgid "Compose a reply to the sender of the selected message"
 msgstr "��ีย��มล�อ���ยั��ู�ส����อ�วาม�ี��ลือ�อยู�"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1440
 msgid "_Save as mbox..."
 msgstr "�ั��ึ����� mbox..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1442
 msgid "Save selected messages as an mbox file"
 msgstr "�ั��ึ���อ�วาม�ี��ลือ�ล��������ม mbox"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1447
 msgid "Search Folder from Mailing _List..."
 msgstr "สร�า���ล��อร����หา�า��_มลลิ�ลิส��..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1449
 msgid "Create a search folder for this mailing list"
 msgstr "สร�า���ล��อร����หาสำหรั��มลลิ�ลิส���ี�"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1454
 msgid "Search Folder from Recipien_ts..."
 msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_รั�..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1456
 msgid "Create a search folder for these recipients"
 msgstr "สร�า���ล��อร����หาสำหรั��ู�รั��หล�า�ี�"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1461
 msgid "Search Folder from Sen_der..."
 msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_ส��..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1463
 msgid "Create a search folder for this sender"
 msgstr "สร�า���ล��อร����หาสำหรั��ู�ส���ี�"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1468
 msgid "Search Folder from S_ubject..."
 msgstr "สร�า���ล��อร����หา�า��ื�อ�_รื�อ�..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1470
 msgid "Create a search folder for this subject"
 msgstr "สร�า���ล��อร����หาสำหรั��ื�อ�รื�อ��ี�"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1475
 msgid "_Message Source"
 msgstr "��อมูล_�ิ��อ���อ�วาม"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1477
 msgid "Show the raw email source of the message"
 msgstr "�ส����อมูล�ิ��อ�อี�มล�อ���อ�วาม"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1489
 msgid "_Undelete Message"
 msgstr "�รีย�_�ื���อ�วาม�ี�ล�"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1491
 msgid "Undelete the selected messages"
 msgstr "�รีย��ื���อ�วามล��ล�ว�ี��ลือ�"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1496
 msgid "_Normal Size"
 msgstr "��า�_���ิ"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1498
 msgid "Reset the text to its original size"
 msgstr "�ั����า�อั�ษร��อ�วาม�ลั�����า��ิม"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1503
 msgid "_Zoom In"
 msgstr "_�ยาย���า"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1505
 msgid "Increase the text size"
 msgstr "��ิ�ม��า�อั�ษร��อ�วาม"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1510
 msgid "Zoom _Out"
 msgstr "�ยาย_ออ�"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1512
 msgid "Decrease the text size"
 msgstr "ล���า�อั�ษร��อ�วาม"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1519
 msgid "Create R_ule"
 msgstr "สร�า�_��"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1526
 msgid "Ch_aracter Encoding"
 msgstr "_รหัสอั��ระ"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1533
 msgid "F_orward As"
 msgstr "ส��_��อ����"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1540
 msgid "_Go To"
 msgstr "��_ยั�"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1547
 msgid "Mar_k As"
 msgstr "�ำ�_�รื�อ�หมาย����"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1554
 msgid "_Message"
 msgstr "_��อ�วาม"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1561
 msgid "_Zoom"
 msgstr "_�ยาย"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1586
 msgid "Mark for Follo_w Up..."
 msgstr "�ำ��รื�อ�หมายว�า�ะ_�อ��ระ�ู�..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1594
 msgid "Mark as _Important"
 msgstr "�ำ��รื�อ�หมายว�า_สำ�ั�"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1598
 msgid "Mark as _Junk"
 msgstr "�ำ��รื�อ�หมาย�����มล_�ยะ"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1602
 msgid "Mark as _Not Junk"
 msgstr "�ำ��รื�อ�หมายว�า�ม�����ม_ล�ยะ"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1606
 msgid "Mar_k as Read"
 msgstr "�ำ��รื�อ�หมาย_อ�า��ล�ว"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1610
 msgid "Mark as Uni_mportant"
 msgstr "�ำ��รื�อ�หมายว�า�_ม�สำ�ั�"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1614
 msgid "Mark as _Unread"
 msgstr "�ำ��รื�อ�หมายว�า_ยั��ม�อ�า�"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1650
 msgid "_Caret Mode"
 msgstr "����_�อร���อร�"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1652
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "�ส����อร���อร��ะ�ริ�����ื�อ�วาม�อ���อ�วาม�ี��ส��"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1658
 msgid "All Message _Headers"
 msgstr "ส�ว�_หัว�อ���อ�วาม�ั��หม�"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1660
 msgid "Show messages with all email headers"
 msgstr "�ส����อ�วาม�ร�อม��วยส�ว�หัว�อ�อี�มล�ั��หม�"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1882
 msgid "Unable to retrieve message"
 msgstr "�ึ���อ�วาม�ม�สำ�ร��"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1886 ../mail/e-mail-reader.c:1946
+#: ../mail/mail-ops.c:1843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "�ำลั��ึ���อ�วาม '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2471
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2464 ../mail/mail-config.ui.h:30
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "�ริยาย"
 
-#: ../mail/e-mail-reader.c:2592
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2585
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "ส��_��อ"
 
-#: ../mail/e-mail-reader.c:2593
+#: ../mail/e-mail-reader.c:2586
 msgid "Forward the selected message to someone"
 msgstr "ส����อ��อ�วาม�ี��ลือ���ยั��ู�อื��"
 
-#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2631 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "ล�"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "�ั���"
 
-#: ../mail/e-mail-reader.c:2645
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "��อ�ห��า"
 
-#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2653 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "�อ��ลั�"
 
@@ -10135,24 +10014,24 @@ msgstr "�ั�����ื�อ�าม�ระ�ู�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:74
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "�ม�มี�าร���ารหัสลั�"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:128
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "���ารหัสลั���วย TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:99
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "���ารหัสลั���วย SSL"
 
@@ -10175,34 +10054,34 @@ msgstr ""
 "�ละ�ำ��รื�อ�หมาย�ี��ล�อ��า��รื�อ�หมาย��ื�อ�ส���ารยอมรั�\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:885 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:969
 msgid "Never"
 msgstr "�ม����"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:970
 msgid "Always"
 msgstr "����สมอ"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:971
 msgid "Ask for each message"
 msgstr "�ามสำหรั����ละ��อ�วาม"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2083
 msgid "Mail Configuration"
 msgstr "�าร�ำห����า�มล"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2084
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10212,7 +10091,7 @@ msgstr ""
 "\n"
 "�ลิ� \"�ั���\" ��ื�อ�ริ�ม"
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2087
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10221,20 +10100,20 @@ msgstr ""
 "�รุ�า��อ���อมูล�ื�อ�ละ�ี�อยู�อี�มล�อ��ุ���า�ล�า��ี� ส�ว�����อ� \"��อมูล�สริม\" �ั�� "
 "�ุ��ม��ำ������อ���ิม��อมูล �ว���สีย���ว�า�ุ�อยา��ะ�ห���อมูล�ั���รา��อยู���อี�มล�ี��ุ�ส��"
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2089 ../mail/em-account-editor.c:2256
+#: ../mail/mail-config.ui.h:92
 msgid "Receiving Email"
 msgstr "�ารรั�อี�มล"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2090
 msgid "Please configure the following account settings."
 msgstr "�รุ�า�ั����า��า�� ��อ���ี��ห��ั��ั��ี"
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2092 ../mail/em-account-editor.c:2727
 msgid "Sending Email"
 msgstr "�ารส��อี�มล"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2093
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10242,11 +10121,11 @@ msgstr ""
 "�รุ�า��อ���อมูล��ี�ยว�ั�วิ�ี�ารส���มล�อ��ุ� ��า�ม�มั�����ห�ลอ��าม�ู��ู�ลระ�� "
 "หรือ�ู��ห��ริ�ารอิ���อร������อ��ุ�"
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2095
 msgid "Account Management"
 msgstr "�าร�ั��าร�ั��ี�ู����"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10254,11 +10133,11 @@ msgstr ""
 "�รุ�า��อ��ื�อ�ี��รรยาย�ั��ี�ี�����อ�ว�า���า�ล�า�\n"
 "�ื�อ�ี��ะ�����ื�อ�าร�ส���ล���า�ั��"
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2100
 msgid "Done"
 msgstr "�สร���ล�ว"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2101
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10272,56 +10151,48 @@ msgstr ""
 "\n"
 "�� \"�ริ�ม���\" ��ื�อ�ั��ึ��าร�ั����า�อ��ุ�"
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2543
 msgid "Check for _new messages every"
 msgstr "_�รว��มล�หม��ุ� �"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2551
 msgid "minu_tes"
 msgstr "�า_�ี"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2914 ../mail/mail-config.ui.h:106
 msgid "Security"
 msgstr "�ารรั�ษา�วาม�ลอ�ภัย"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2959 ../mail/em-account-editor.c:3027
 msgid "Receiving Options"
 msgstr "�ัว�ลือ��ารรั��มล"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2960 ../mail/em-account-editor.c:3028
 msgid "Checking for New Messages"
 msgstr "�าร�รว�สอ���อ�วาม�หม�"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "ห��า��า�������ั��ี"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "��รื�อ�มือ��วย�ั����า�ั��ี Evolution"
-
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1542
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "��อ�วาม�อ��ุ��ี�ส���ึ� %s �รื�อ� \"%s\" �มื�อ %s �ู���ิ�อ�า��รีย�ร�อย�ล�ว"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1590
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "�าร�����าร��ิ�อ�า���อ�วามสำหรั�: \"%s\""
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1919
 msgid "an unknown sender"
 msgstr "�ู�ส���ี��ม�รู��ั�"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:1966
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10329,19 +10200,19 @@ msgstr ""
 "�มื�อ ${AbbrevWeekdayName} ${Year}-${Month}-${Day} �วลา ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} ��ีย�ว�า:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2110
 msgid "-----Original Message-----"
 msgstr "-------- ��อ�วาม��ิม --------"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2290
 msgid "Posting destination"
 msgstr "�ี��ี��ะ��ะ�ระ�าศ"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2291
 msgid "Choose folders to post the message to."
 msgstr "�ลือ���ล��อร��ี��ะ��ะ�ระ�าศ��อ�วาม"
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "�ลือ���ล��อร�"
 
@@ -10358,10 +10229,18 @@ msgstr "���มสี"
 msgid "Assign Score"
 msgstr "�ห��ะ���"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "�สีย��ี��"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "�สร���มื�อ"
@@ -10422,6 +10301,10 @@ msgstr "�าร�าม�ระ�ู�"
 msgid "Forward to"
 msgstr "ส����อ�ึ�"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "สำ�ั�"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "หลั�"
@@ -10446,7 +10329,7 @@ msgstr "�ม��ู��ลือ��ว�"
 msgid "is set"
 msgstr "�ู��ลือ��ว�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "�มล�ยะ"
 
@@ -10495,7 +10378,7 @@ msgid "Play Sound"
 msgstr "�ล���สีย�"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "อ�า��ล�ว"
 
@@ -10576,16 +10459,16 @@ msgid "Unset Status"
 msgstr "ย��ลิ�ส�า�ะ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "�ล�ว"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "��ิ�ม�าร_�ระ�ำ"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "��อ�วาม�ี�ยั��ม����อ�า�:"
@@ -10593,24 +10476,24 @@ msgstr[1] "��อ�วาม�ี�ยั��ม����อ�า�
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "��อ�วาม�ั��หม�:"
 msgstr[1] "��อ�วาม�ั��หม�:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "�าร�����ว��า (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "�าร�����ว��า"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "�ุ�สม�ั�ิ��ล��อร�"
 
@@ -10618,37 +10501,37 @@ msgstr "�ุ�สม�ั�ิ��ล��อร�"
 msgid "<click here to select a folder>"
 msgstr "<�ลิ��ี��ี���ื�อ�ลือ���ล��อร�>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "_สร�า�"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "�ื�อ�_�ล��อร�:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1070 ../mail/mail-vfolder.c:1135
 msgid "Search Folders"
 msgstr "��ล��อร����หา"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "�ม��ร�"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:774 ../mail/em-folder-tree-model.c:1117
 msgid "Loading..."
 msgstr "�ำลั��หล�..."
 
-#: ../mail/em-folder-tree.c:192
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "�ำลั��รว���ล��อร���า�� �� \"%s\""
 
-#: ../mail/em-folder-tree.c:605
+#: ../mail/em-folder-tree.c:597
 msgid "Folder names cannot contain '/'"
 msgstr "�ื�อ��ล��อร�มี '/' �ม����"
 
@@ -10670,173 +10553,173 @@ msgstr "�ื�อ��ล��อร�มี '/' �ม����"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1087
+#: ../mail/em-folder-tree.c:1079
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1295
+#: ../mail/em-folder-tree.c:1287
 msgid "Mail Folder Tree"
 msgstr "ลำ�ั��ั����ล��อร��มล"
 
-#: ../mail/em-folder-tree.c:1578 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1593 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "�ำลั�ย�าย��ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:1580 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1595 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "�ำลั��ั�ลอ���ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:1587 ../mail/message-list.c:2100
+#: ../mail/em-folder-tree.c:1602 ../mail/message-list.c:2107
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "�ำลั�ย�าย��อ�วาม��ยั���ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:1589 ../mail/message-list.c:2102
+#: ../mail/em-folder-tree.c:1604 ../mail/message-list.c:2109
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "�ำลั��ั�ลอ���อ�วาม��ยั���ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:1604
+#: ../mail/em-folder-tree.c:1619
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�ม�สามาร�วา���อ�วามล����หล������ระ�ั���สุ����"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "ย�าย��ล��อร���ยั�"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "�ั�ลอ���ล��อร���ยั�"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:509
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "�ำลั�สร�า���ล��อร� `%s'"
+msgid "Creating folder '%s'"
+msgstr "�ำลั�สร�า���ล��อร� '%s'"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:672
 msgid "Create Folder"
 msgstr "สร�า���ล��อร�"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:673
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Specify where to create the folder:"
 msgstr "ระ�ุ�ี��ี��ะสร�า���ล��อร�"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:693
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "�ำลั��ลิ��อ�รั���อมูล�า���ล��อร� \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1567
 msgid "Unsigned"
 msgstr "�ม�มีลาย�����ำ�ั�"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "��อ�วาม�ี��ม�มีลาย�����ำ�ั� �ม�มีอะ�ร�ระ�ั�����ลยว�า��อ�วาม�ี�����มา�า��ู�ส���ริ�"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1568
 msgid "Valid signature"
 msgstr "ลาย�����ู���อ�"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "��อ�วาม�ี�มีลาย�����ำ�ั��ี��ู���อ� �ึ��หมาย�วามว�า ��อ�วาม�ี���า�ะมา�า��ู�ส���ริ�"
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1569
 msgid "Invalid signature"
 msgstr "ลาย�����ม��ู���อ�"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ลาย�����ำ�ั���อ�วาม�ี��รว�สอ��ล�ว�ม���า� ���������ว�า��อ�วามอา��ู������ระหว�า��า�"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1570
 msgid "Valid signature, but cannot verify sender"
 msgstr "ลาย�����ู���อ� ����ม�สามาร��รว�สอ��ู�ส��"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "��อ�วาม�ี�มีลาย�����ำ�ั��ี��ู���อ� ����ม�สามาร��รว�สอ��ู�ส����อ�วาม���"
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1571
 msgid "Signature exists, but need public key"
 msgstr "มีลาย���� ����ม�มี�ุ���สา�าร�ะ"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "��อ�วาม�ี�มีลาย�����ำ�ั� ����ม�มี�ุ���สา�าร�ะ�ี��ะ����รว�สอ�"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1577
 msgid "Unencrypted"
-msgstr "�ม�������ารหัส"
+msgstr "�ม�������ารหัสลั�"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "��อ�วาม�ี��ม�������ารหัส ��ื�อหาอา��ู��ั�อ�า�ระหว�า��า���อิ���อร��������"
+msgstr "��อ�วาม�ี��ม�������ารหัสลั� ��ื�อหาอา��ู��ั�อ�า�ระหว�า��า���อิ���อร��������"
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1578
 msgid "Encrypted, weak"
-msgstr "���ารหัส���อ�อ�"
+msgstr "���ารหัสลั����อ�อ�"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"��อ�วาม�ี��ู����ารหัส ������อัล�อริ�ึม���ารหัส�ี�อ�อ� �ุ��ลอื��อา��ั�อ�า����ยา����ริ� "
+"��อ�วาม�ี��ู����ารหัสลั��ว� ������อัล�อริ�ึม���ารหัสลั��ี�อ�อ� �ุ��ลอื��อา��ั�อ�า����ยา����ริ� "
 "������ม�����������ม���� ��ย����วลา�ม�มา���ิ���"
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1579
 msgid "Encrypted"
-msgstr "���ารหัส"
+msgstr "���ารหัสลั�"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "��อ�วาม�ี��ู����ารหัส �ุ��ลอื���ั�อ�า���ื�อหา���ยา�"
+msgstr "��อ�วาม�ี��ู����ารหัสลั��ว� �ุ��ลอื���ั�อ�า���ื�อหา���ยา�"
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1580
 msgid "Encrypted, strong"
-msgstr "���ารหัส�������ห�า"
+msgstr "���ารหัสลั��������ห�า"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"��อ�วาม�ี��ู����ารหัส��วยอัล�อริ�ึม���ารหัส�ี�����ห�า �ุ��ลอื���ั�อ�า���ื�อหา���ยา�มา� ��วย�วลา���ิ"
+"��อ�วาม�ี��ู����ารหัสลั���วยอัล�อริ�ึม���ารหัสลั��ี�����ห�า �ุ��ลอื���ั�อ�า���ื�อหา���ยา�มา� ��วย�วลา���ิ"
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_�ู��รั�รอ�"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "��รั�รอ��ี���ิ��ู�ม����"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10844,117 +10727,130 @@ msgstr ""
 "Evolution �ม�สามาร��ส���มล��ั��ี���� ��ื�อ��า�มี��า��ห����ิ��� "
 "�ุ�สามาร��ส���มล�ี�������ม��ั�รู���� หรือ�ะ��ิ���วย��รื�อ�มือ�����ภาย�อ������"
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "�สร���มื�อ"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 msgid "Overdue:"
 msgstr "�ลย�ำห��:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "��ย"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html-display.c:1000
 msgid "View _Unformatted"
 msgstr "�ส������_ม��ั�รู����"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:955
 msgid "Hide _Unformatted"
 msgstr "��อ��าร�ส������_ม��ั�รู����"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1020
 msgid "O_pen With"
 msgstr "�_�ิ���วย"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:162
 #, c-format
 msgid "Page %d of %d"
 msgstr "ห��า %d �า� %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:151
 msgid "Formatting message"
 msgstr "�ำลั��ั��รีย���อ�วาม"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:345
 msgid "Formatting Message..."
 msgstr "�ำลั��ั��รีย���อ�วาม..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1414 ../mail/em-format-html.c:1423
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "�ำลั��ึ� `%s'"
+msgid "Retrieving '%s'"
+msgstr "�ำลั��ึ� '%s'"
 
-#: ../mail/em-format-html.c:1859
+#: ../mail/em-format-html.c:1888
 msgid "Unknown external-body part."
 msgstr "��อ�วามส�ว�ภาย�อ��ี��ม�รู��ั�"
 
-#: ../mail/em-format-html.c:1867
+#: ../mail/em-format-html.c:1896
 msgid "Malformed external-body part."
 msgstr "��อ�วามส�ว�ภาย�อ��ิ�รู����"
 
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�ัว�ี���ยั��หล�� FTP (%s)"
 
-#: ../mail/em-format-html.c:1908
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�ัว�ี���ยั����ม����รื�อ� (%s) ������สำหรั���รื�อ� \"%s\""
 
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�ัว�ี���ยั����ม����รื�อ� (%s)"
 
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1960
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�ัว�ี���ยั���อมูล����รือ��าย (%s)"
 
-#: ../mail/em-format-html.c:1942
+#: ../mail/em-format-html.c:1971
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�ัว�ี���ยั���อมูลภาย�อ��ี��ม�รู��ั� (��ิ� \"%s\")"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2602
+#: ../mail/em-format-html.c:2634
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "��อ�วาม�ี��ู�ส����ย <b>%s</b> ���าม�อ� <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "��อ�วาม�ี��ู�ส����ย %s ���าม�อ� %s"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:668
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�หล�������ี��ม�รอ�รั��าร�อ�รั� หรือ�ม������ิ��ห��อ�รั����"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:719
 msgid "Subscribed"
 msgstr "�อ�รั��ล�ว"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:723
 msgid "Folder"
 msgstr "��ล��อร�"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1111
 msgid "Please select a server."
 msgstr "�รุ�า�ลือ���ิร���วอร�"
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1157
 msgid "No server has been selected"
 msgstr "�ม�����ลือ���ิร���วอร�"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "�ุ������หรือ�ม� ว�า��อ��าร��ิ���อ�วาม�ั�� %d ��อ�วาม�ร�อม� �ั�?"
+msgstr[1] "�ุ������หรือ�ม� ว�า��อ��าร��ิ���อ�วาม�ั�� %d ��อ�วาม�ร�อม� �ั�?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "�_ม���อ��ส����อ�วาม�ี�อี�"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "�ัว�รอ���อ�วาม"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:853
 #, c-format
 msgid "Messages from %s"
 msgstr "��อ�วาม�า� %s"
@@ -10963,7 +10859,7 @@ msgstr "��อ�วาม�า� %s"
 msgid "Search _Folders"
 msgstr "�_�ล��อร����หา"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "��ิ�ม��ล��อร�"
 
@@ -11004,50 +10900,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "�วาม�ว�า��อ�ห��า��า� \"รั��ละส���มล\""
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "�ห� Evolution �ส���า�ส�ว��อ���อ�วาม����า��ำ�ั����"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ร�อ��อ�ห�ส���าร����รั���อ�วาม�สมอ"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "�รว�รู�ห��า�ส��อารม�����ยอั���มั�ิ"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "�รว�รู�ลิ�����ยอั���มั�ิ"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "�รว�สอ���หมาย���าว�า�����มล�ยะหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "สี�����ารอ�า��ำ�ู�"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "สีสำหรั������ารอ�า��ำ�ู�"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "�วามสู��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "���ร��อรีสำหรั�อ�า�/������มสำหรั���รื�อ�มือ��ีย���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "�ำ�ั��าร�ส��ราย�าร�ี�อยู�����อ� �ึ�/สำ��า�ึ�/สำ��าลั��ึ�"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11055,7 +10947,7 @@ msgstr ""
 "�ำ�ั��าร�ส��ราย�าร�ี�อยู�����อ� �ึ�/สำ��า�ึ�/สำ��าลั��ึ� �ม��ห���ิ��ำ�ว��ี�ระ�ุ�� "
 "address_count"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11063,84 +10955,84 @@ msgstr ""
 "�ำห���วาม�ี��อ��าร�รั���อมูลระหว�า��าร��ลี�ย���ล�����รื�อ��ั���ิร���วอร��มล����รือ��าย�ห��ร��ั� "
 "��ว��วลา��อ��ม���ำ�ว�า 30 วิ�า�ี"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "��อมูลส�ว�หัว�ี��ะ�����ะ�รว�หา�ยะ"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
 "��อมูลส�ว�หัว�ี��ะ�����ะ�รว�หา�ยะ สมา�ิ����ละ�ัว��ราย�าร����ส�ริ���รู� \"�ื�อส�ว�หัว=��า\""
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ�����ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ�����ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ����ส����หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ����ส����หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "รู�����ริยาย�อ��ารส����อ��อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "�วามสู��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "�วามสู��ริยาย�อ�ห��า��า��ส���มล"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "�วามสู��ริยาย�อ��ล�อ�����อ��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "ส�า�ะ�าร�ยาย���ม��ย�ริยาย�อ�ห��า��า��ส���มล"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "รู�����ริยาย�อ��าร�อ���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "ส�า�ะ�ริยาย�อ��าร�ยาย�ระ�ู�"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า��ส���มล"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "�วาม�ว�า��ริยาย�อ��ล�อ�����อ��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "�ำห��ว�า ���าร�รอ��ยะ �ะ��ิ�หา�ี�อยู��ู�ส����สมุ��ี�อยู�����รื�อ����า�ั��หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "�ำห��ว�า�ะ��ิ�หา�ี�อยู��ู�ส����สมุ��ี�อยู�หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11151,11 +11043,11 @@ msgstr ""
 "�ะ��ิ���สมุ��ี��ู��ลือ��ว�สำหรั���ิม���ม�ี�อยู����อั���มั�ิ �ึ��อา��ะ��า��าสมุ��ั��ล�าวอยู�����รือ��าย "
 "(���� LDAP)"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "�ำห��ว�า�ะ�����อมูลส�ว�หัว�ำห���อ�สำหรั��รว��ยะหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11164,7 +11056,7 @@ msgstr ""
 "�ำห��ว�า�ะ�����อมูลส�ว��ี�หัว�ำห���อ�สำหรั��รว��ยะหรือ�ม� ��า��ิ�����ัว�ลือ��ี� "
 "�ละ��อ�วามมี��อมูลส�ว�หัว�ี��ำ�ั�มา ���ะ��วย�ห��าร�รว��ยะ�ำ���รว��ร�ว�ึ��"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11172,18 +11064,22 @@ msgstr ""
 "�ำห��ว�า�ะ������อั�ษร��ียว�ั�สำหรั��ั���รร�ั� \"�า�\" �ละ \"�รื�อ�\" ����อ� \"��อ�วาม\" "
 "��มุมมอ�����ั��หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "���ร��อรีสำหรั�อ�า�/������มสำหรั���รื�อ�มือ��ีย���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "���ร��อรีสำหรั��ั��ึ����มส�ว��ระ�อ���า�� �อ��มล"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "�ิ�หรือ��ิ��ารละ�ื�อ��ล��อร���วย�ุ�����ลา�������า�"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "�ม���อ���ิม��รื�อ�หมาย�ั��ลาย����"
@@ -11256,14 +11152,16 @@ msgstr ""
 "�ละ����ล��อร���า��"
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "��ิ������ื�อ�ส���า�ส�ว��อ���อ�วาม����า��ี��ำ�ั�"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "��ิ�/�ิ��าร�����อร���อร�"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:47
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "ล�รหัส�ื�อ���ม������อ� Outlook/GMail"
 
@@ -11403,11 +11301,11 @@ msgstr ""
 "�ม��������ารล��า��ล�าร���หา���า�ั��"
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "�วลา����อ�วาม�ยะ�รั��สุ���าย"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "�วลา���ยะ�รั��สุ���าย"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11517,142 +11415,144 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "�����ารอ�า��ำ�ู����ัวอย�า���อ�วาม"
 
 #: ../mail/evolution-mail.schemas.in.h:109
+#, fuzzy
+#| msgid "Message Display"
+msgid "Message text limit for display"
+msgstr "�าร�ส����อ�วาม"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "รู�����าร�ส����อ�วาม (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the junk on exit"
 msgstr "�ำ�ว�วั��ี���อย�ี�สุ�ระหว�า��าร����อ�วาม�ยะ��อ�ออ����ละ�รั��"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum days between emptying the trash on exit"
 msgstr "�ำ�ว�วั��ี���อย�ี�สุ�ระหว�า��าร���ยะ��อ�ออ����ละ�รั��"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "�วลา�ี���อย�ี�สุ�ระหว�า��าร����อ�วาม�ยะ��อ�ออ����ละ�รั�� ����วั�"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "�วลา�ี���อย�ี�สุ�ระหว�า��าร���ยะ��อ�ออ����ละ�รั�� ����วั�"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "�ำ�ว�ราย�าร�ี�อยู��ี��ะ�ส������อ� �ึ�/สำ��า�ึ�/สำ��าลั��ึ�"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "�าม�มื�อหัว�รื�อ���อ�วามว�า���ล�า"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "�าม�ู�����มื�อ�ู�����ยายาม�����วา���ล��อร�"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "�าม�ู�����มื�อ�ู�����ยายามส����อ�วาม�ี��ม�มีหัว�รื�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "�าม��อ�ล���อ�วาม����ล��อร����หา"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "�าม�มื�อ�ู����สั�������วา�"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "�าม�มื�อ�ู����ระ�ุ���สำ��าลั�"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "�าม��อ���า�ู�����ยายาม��ิ���อ�วาม�ั����� 10 ��อ�วาม�ึ�����ร�อม�ั�"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "�าม�มื�อ�ู�����ยายามส���มล��รู� HTML ��ยั��ู�รั��ี�อา��ม���อ��ารรั��มล��รู� HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "�าม�มื�อ�ู�����ยายามส����อ�วาม��ย�ม�มี�ู�รั���ราย�าร \"�ึ�\" หรือ \"สำ��า�ึ�\" �ลย"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "�าม�มื�อ�ู�����ยายามส�� HTML ��ย�ี��ู�รั��ม���อ��าร"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "�าม�มื�อ�ู�����ำ��รื�อ�หมาย��อ�วามหลายราย�าร"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "�ส�ลาย����ส�ว��ัว�ว���า����อ���อ�วาม�ี��อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "วา���อร���อร��ว��ี���าย��อ�วาม�ี��อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "�รว�รู�ห��า�ส��อารม������อ�วาม�ละ����ี���วยรู�ภา��ห�"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "�รว�รู�ลิ�������อ�วาม�ละ����ี��ห�"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "�รว��วาม�����ยะ����หมาย���า�ุ���ั�"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "���ร��อรีสำหรั��ั��ึ�"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "���หารู��อ��ู�ส���า�สมุ��ี�อยู�����รื�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "ส���มล��รู� HTML ��ย�ริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "ส���มล��รู� HTML ��ย�ริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "�ส���อลัม���ี�อยู�อี�มล�ู�ส����ราย�าร��อ�วาม��วย"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "��ว��วลา�าร�รั���อมูล�ั���ิร���วอร�"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "�ำห������ TRUE ��า�ุ��ม���อ��าร��ิม��รื�อ�หมาย�ั����อ�ลาย�����อ��ุ��มื�อ��ีย��มล"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "�ส����อ� \"สำ��าลั��ึ�\" �มื�อส���มล"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "�ส����อ� \"สำ��า�ึ�\" �มื�อส���มล"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "�ส����อ� \"�า�\" �มื�อ��ะ�ระ�าศ���ลุ�ม��าว"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "�ส����อ� \"�า�\" �มื�อส���มล"
-
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "�ส����อ� \"�ี�อยู��อ��ลั�\" �มื�อ��ะ�ระ�าศ���ลุ�ม��าว"
@@ -11721,32 +11621,26 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr "�ส����อ� \"�า�\" �มื�อส���มล �ึ���ะ�ว��ุม�า��ม�ู \"มุมมอ�\" �มื�อมี�าร�ลือ��ั��ี�มล"
-
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
 "�ส����อ� \"�ี�อยู��อ��ลั�\" �มื�อ��ะ�ระ�าศ���ลุ�ม��าว �ึ���ะ�ว��ุม�า��ม�ู \"มุมมอ�\" "
 "�มื�อมี�าร�ลือ��ั��ี�ลุ�ม��าว"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
 "�ส����อ� \"�ี�อยู��อ��ลั�\" �มื�อส���มล �ึ���ะ�ว��ุม�า��ม�ู \"มุมมอ�\" �มื�อมี�าร�ลือ��ั��ี�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "�ส���อลัม���ี�อยู�อี�มล�ู�ส����ราย�าร��อ�วาม��วย"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11755,51 +11649,49 @@ msgstr ""
 "�ส����อมูลส�ว�หัว \"วั��ี\" �าม�����ั� (��ย����วลา��อ��ิ���มื�อ����วลา��า��ั����า�ั��) มิ�ะ�ั�� "
 "���ะ�ส����อมูลส�ว�หัว \"วั��ี�\" ��วยรู�����ี��ู�����ำห�� �ละ�������วลา��อ��ิ��"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "�ส��รู��อ��ู�ส������อ�อ�า���อ�วาม��วย"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Spell check inline"
 msgstr "�รว��ัวสะ����ะ�ิม��"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell checking color"
 msgstr "สี�อ��าร�รว��ัวสะ��"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking languages"
 msgstr "ภาษา�ี��รว��ัวสะ��"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Subscribe dialog default height"
 msgstr "�วามสู��ริยาย�อ�ห��า��า��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default width"
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Terminal font"
 msgstr "���อั�ษร��อร�มิ�ัล"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "��า�ส�ว��อ���อ�วามสู�สุ�"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "The default plugin for Junk hook"
 msgstr "�ลั��อิ��ริยายสำหรั��าร�รว���อ�วาม�ยะ"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "�วลา����อ�วาม�ยะ�รั��สุ���าย ����วั��ั��า��ุ��ริ�ม�ั��วลายู�ิ���"
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "�วลา����อ�วาม�ยะ�รั��สุ���าย ����วั��ั��า� 1 ม�รา�ม 2513 (�ุ��ริ�ม�ั��วลายู�ิ���)"
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "�วลา���ยะ�รั��สุ���าย ����วั��ั��า��ุ��ริ�ม�ั��วลายู�ิ���"
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "�วลา���ยะ�รั��สุ���าย ����วั��ั��า� 1 ม�รา�ม 2513 (�ุ��ริ�ม�ั��วลายู�ิ���)"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11810,15 +11702,15 @@ msgstr ""
 "�ะวา���อ��ส���ัวอย�า��ว����ราย�ื�อ��อ�วาม \"1\" (�����ว�ั��) "
 "�ะวา���อ��ส���ัวอย�า��ว���า�ราย�ื�อ��อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The terminal font for mail display."
 msgstr "���อั�ษร��อร�มิ�ัลสำหรั��ส����อ�วาม�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "The variable width font for mail display."
 msgstr "���อั�ษร�วาม�ว�า��ม����ี�สำหรั��ส����อ�วาม�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11826,15 +11718,20 @@ msgstr ""
 "��า�ี����������มีสาม��า �ือ \"0\" สำหรั���อ�ิ��ลา�, \"1\" สำหรั��ำ��ือ� �ละ \"2\" "
 "สำหรั���อ�วาม�ี�ั��"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+#: ../mail/evolution-mail.schemas.in.h:174
+#, fuzzy
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "��า�ี��ำห����า�สู�สุ��อ�ส�ว��อ���อ�วาม�ี��ะสามาร��ั�รู������ Evolution ��� ��า�ริยาย�ือ 4 "
 "MB หรือ 4096 KB �ละ�ำห����า��ห��วย KB"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11843,7 +11740,7 @@ msgstr ""
 "�ม��ะ��ิ�����ลั��อิ��รว���อ�วาม�ยะ�ว�หลาย�ัว �ี������ลั��อิ��ริยาย ��า�ลั��อิ��ริยาย�ู��ิ� "
 "���ะ�ม��ยายาม�อย������ลั��อิ�อื�����"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11851,7 +11748,7 @@ msgstr ""
 "��า�ี��ะ�ู�อ�า���ีย��รั����ียว �ล�วล�า���า���� \"false\" �ั��ีหลั��า�อ�า� ห��า�ี��อ��ีย��ี� "
 "�ือย��ลิ��าร�ลือ��มล��ราย�าร �ละย��ลิ��าร�ส���ัวอย�า�อี�มลสำหรั���ล��อร��ั���"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11862,7 +11759,7 @@ msgstr ""
 "�ร�อม�ำห����วยว�า�ะ�ส��หรือ�ม� รู�����อ���ร�สร�า� XML �ือ &lt;header enabled&gt; "
 "��ย�ำห�� enabled ��า��อ��าร�ห��ส�� header ��มุมมอ��มล"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11872,11 +11769,11 @@ msgstr ""
 "�ละ����ำห��ว�า�ะ��ิ�หา�ี�อยู���สมุ��ี�อยู�����รื�อ����า�ั��หรือ�ม� "
 "��ื�อ��าม�าร�รว��ยะ���มล�ี�ส��มา�า��ู��ิ���อ�ี�รู��ั�"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "This option would help in improving the speed of fetching."
 msgstr "�ัว�ลือ��ี��ะ��วย��ิ�ม�วาม�ร�ว���าร�ึ���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11884,13 +11781,13 @@ msgstr ""
 "�ำห���ำ�ว�ราย�าร�ี�อยู��ี��ะ�ส����มุมมอ�ราย�าร��อ�วาม�ริยาย �ึ��ราย�าร�ี���ิ��ั�� �ะ�ู������วย "
 "'...'"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "��า�ี��ำห��ว�า�ะ�ยายหรือยุ��ระ�ู���ย�ริยาย ��อ���ิ� Evolution �หม��ึ��ะมี�ล"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11899,51 +11796,51 @@ msgstr ""
 "��า�ี��ำห��ว�า�ะ�รีย��ระ�ู��ามลำ�ั���อ�หลั������ละสาย ����าร�รีย��ามวั��ี� ��อ���ิ� Evolution "
 "�หม��ึ��ะมี�ล"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Thread the message-list based on Subject"
 msgstr "�รีย��ระ�ู���ราย�าร��อ�วาม�ามหัว�รื�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Timeout for marking message as seen"
 msgstr "�ำห���วลา�ี��ะ�ำ��รื�อ�หมาย��อ�วามว�าอ�า��ล�ว"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Timeout for marking message as seen."
 msgstr "�ำห���วลา�ี��ะ�ำ��รื�อ�หมาย��อ�วามว�าอ�า��ล�ว"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "UID string of the default account."
 msgstr "ส�ริ� UID �อ��ั��ี�ริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "สี�อ��ส������ี��ี������ำสะ���ิ��มื�อ����าร�รว��ัวสะ����ะ�ิม��"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Use SpamAssassin daemon and client"
 msgstr "����ีมอ��ละ��ล�อ����อ� SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "����ีมอ��ละ��ล�อ����อ� SpamAssassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use custom fonts"
 msgstr "������อั�ษร�ำห���อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use custom fonts for displaying mail."
 msgstr "������อั�ษร�ำห���อ�สำหรั��ส���ล�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use only local spam tests."
 msgstr "��สอ�ส��ม����ม������รือ��าย���า�ั��"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use only the local spam tests (no DNS)."
 msgstr "��สอ�ส��ม����ม������รือ��าย���า�ั�� (�ม���� DNS)"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11952,7 +11849,7 @@ msgstr ""
 "�ู����สามาร��ว��ุม���ว�า�ะ�ห�วา���อร���อร��ี��ห��มื�อ�ะ�อ���อ�วาม "
 "��ยระ�ุว�า�ะ�ห�วา���อร���อร��ว��ี��ห�ือหรือ�����อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11961,19 +11858,19 @@ msgstr ""
 "�ู����สามาร��ว��ุม���ว�า�ะ�ห��ส�ลาย�����ี��ห��มื�อ�ะ�อ���อ�วาม "
 "��ยระ�ุว�า�ะ�ห��ส�ลาย�����ว��ี��ห�ือหรือ�����อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Variable width font"
 msgstr "���อั�ษร�วาม�ว�า��ม����ี�"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "�ำห��ว�า�ะ��ิม�ารร�อ��อ�ห������ารรั��มล���ุ���อ�วาม�ี�ส����ย�ริยายหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "�ำห��ว�า�ะ�ิ��ารละ�ื�อ��ล��อร���วย�ุ�����ลา�������า�หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11981,544 +11878,599 @@ msgstr ""
 "�ำห��ว�า�ะ�อย�ลั�������าร�รีย��ระ�ู���อ�วาม��ยอาศัยหัว�รื�อ��มื�อ��อ�วาม�ม�มี��อมูลส�ว�หัว In-"
 "Reply-To หรือ Reference หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "�ำห��ว�า�ะ�รีย��ระ�ู��ามลำ�ั���อ�หลั������ละสายหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Width of the message-list pane"
 msgstr "�วาม�ว�า��อ���อ�ราย�าร��อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Width of the message-list pane."
 msgstr "�วาม�ว�า��อ���อ�ราย�าร��อ�วาม"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "�ำลั��ำ���า��อมูล Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "�มล"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "��รื�อ�มือ�ำ���า��อมูล Elm �อ� Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "�ำ���า�มล�า� Elm"
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "��ล��อร��ลาย�า�:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+msgid "_Destination folder:"
+msgstr "��ล��อร�_�ลาย�า�:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "�ลือ���ล��อร�"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "�ลือ���ล��อร��ี��ะ�ห��ำ���า"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:245
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "�รื�อ�"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+msgctxt "mboxImp"
+msgid "From"
+msgstr "�า�"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "�ล�อ��มล�อ���ิร��ลีย� (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "��รื�อ�มือ�ำ���า��ล��อร���รู���� mailbox �อ� Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "�ำลั��ำ���า�ล�อ���หมาย"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
-msgstr "�ำลั��ำ���า `%s'"
+msgid "Importing '%s'"
+msgstr "�ำลั��ำ���า '%s'"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:293
 #, c-format
 msgid "Scanning %s"
 msgstr "�ำลั��รว�สอ� %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "�ำลั��ำ���า��อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "สมุ��ี�อยู�"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:419
 msgid "Evolution Pine importer"
 msgstr "��รื�อ�มือ�ำ���า��อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:420
 msgid "Import mail from Pine."
 msgstr "�ำ���า�มล�า� Pine"
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "�มล��ยั� %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "�มล�า� %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "�รื�อ� %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "�มลลิ�ลิส�� %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "��ิ�ม���าร�รอ�"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(หมาย�ห�ุ: ��อ��ริ�ม��ร��รม�หม��ึ��ะมี�ล)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<p>�ัว�ลือ��าร�อ��ั�����มล</b> (�ม��อ��ะ�ำ)"
+msgid "(Not Recommended)"
+msgstr "(�ม���ะ�ำ)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(หมาย�ห�ุ: ��อ��ริ�ม��ร��รม�หม��ึ��ะมี�ล)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "��อมูล�ั��ี"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "��ิ�มลาย�����_หม�..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "�����ำ�ั���อ�วามออ��_สมอ�มื�อ����ั��ี�ี�"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "���ารหัส�ึ����อ�_��วย�มื�อส����อ�วาม���ารหัส"
+msgstr "���ารหัสลั��ึ����อ�_��วย�มื�อส����อ�วาม���ารหัสลั�"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ส��_สำ��า (cc) �ุ��รั�� �ึ�:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ส��สำ��า_ลั� (bcc) �ุ��รั�� �ึ�:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "�_�ื�อ�ือ�ุ������ว��ุ����อ���า����า�สมอ�มื�อ�ะ���ารหัส"
+msgstr "�_�ื�อ�ือ�ุ������ว��ุ����อ��ั��สมอ�มื�อ�ะ���ารหัสลั�"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "���ารหัส�ึ�_��า����า�สมอ�มื�อส����อ�วาม���ารหัส"
+msgstr "���ารหัสลั��ึ��ั_��สมอ�มื�อส����อ�วาม���ารหัสลั�"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "ร�อ��อ�าร�_���รั���อ�วาม�สมอ"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "�ารยื�ยั��ัว�ุ��ล"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "��ร�รู��ส��_อารม����ยอั���มั�ิ"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "�ุ�_อั��ระ:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_�รว�สอ���ิ��ี�รอ�รั�"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "�รว�_สอ��ยะ��วย��อมูลส�ว��ี�หัว�ำห���อ�"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "�รว�สอ���อ�วาม�า�_��าว�า�����มล�ยะหรือ�ม�"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "�รว��ัวสะ����ะ_�ิม��"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "�รว�สอ��มล�ี����ามา�����มล�ยะ"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
-msgstr "_ล�า�"
+msgstr "ล�_า�"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "ล�า_�"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "_สีสำหรั��ำ�ี�สะ���ิ�:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "�าร��ีย���หมาย"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "��า�ั��"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "�าม��อ������วา_���ล��อร�"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "Default Behavior"
 msgstr "�ฤ�ิ�รรม���ิ"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Default character e_ncoding:"
 msgstr "ร_หัสอั��ระ�ริยาย:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "ล��มล"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "ล���อ�วาม�ยะ��อ�_ออ�"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "�_���ลาย�����ิ�ิ�ัล�ำ�ั���อ�วามออ� (��ย�ริยาย)"
+msgstr "����ลาย�����ิ�ิ�ัล�ำ�ั���อ�วาม_ออ� (��ย�ริยาย)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "ส�ว�_หัว�ี��ส���อ���อ�วาม"
+#: ../mail/mail-config.ui.h:38
+msgid "Displayed Message Headers"
+msgstr "ส�ว�หัว�ี��ส���อ���อ�วาม"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "�ม���อ��ั�รู������อ�วาม��า��า��_�ิ�"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "�ม���อ��ส����อ�วาม��า��า��_�ิ�"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�_ม���อ��ำ��รื�อ�หมาย��อ�วามว�า�����ยะ��า�ู�ส��อยู���สมุ��ี�อยู�"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "�ม�อ�า��ำ�ู�"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "�_�ล��อร���หมายร�า�:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "�ี�อยู�อี�_มล:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "��_�ั��ยะ��อ�ออ�"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Magic S_pacebar"
 msgstr "��ิ������ร��_ว��วรร������ุ�ม�ำ�า�ลั�"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Sea_rch Folders"
 msgstr "��ิ������ล��อร�_���หา"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:48
 msgid "Encry_ption certificate:"
 msgstr "��รั�รอ��าร���าร_หัสลั�:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Encrypt out_going messages (by default)"
 msgstr "�_��ารหัสลั���อ�วามออ� (��ย�ริยาย)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Fi_xed-width:"
 msgstr "�วาม�ว�า�_���ี�:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
 msgid "Fix_ed width Font:"
 msgstr "���อั�ษร�วาม�ว�า�_���ี�:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
 msgid "Font Properties"
 msgstr "�ุ�สม�ั�ิ���อั�ษร"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
 msgid "Format messages in _HTML"
 msgstr "�ั�รู������อ�วาม���� _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
 msgid "Full Nam_e:"
 msgstr "�ื�อ�_��ม:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:56
 msgid "HTML Messages"
 msgstr "��อ�วาม HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "H_TTP Proxy:"
 msgstr "_�ร�อ��ี HTTP:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "ส�ว�หัว"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "�����ารอ�า�_�ำ�ู���วยสี"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "����อ�วาม"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "���รร�ั� (��� Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:65 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "��าย"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:66
 msgid "Languages Table"
 msgstr "�ารา�ภาษา"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid "Loading Images"
 msgstr "�าร�หล�ภา�"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
 msgid "Mail Headers Table"
 msgstr "�ารา���อมูลส�ว�หัว�อ��มล"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:69
 msgid "Mailbox location"
 msgstr "�ำ�ห����ล�อ��มล"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:70
 msgid "Message Display"
 msgstr "�าร�ส����อ�วาม"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:71
 msgid "Message Fonts"
 msgstr "���อั�ษร�อ���อ�วาม"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72
 msgid "Message Receipts"
 msgstr "�าร����รั���อ�วาม"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:73
 msgid "No _Proxy for:"
 msgstr "�_ม�����ร�อ��ีสำหรั�:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "หมาย�ห�ุ: �ุ��ะ�ม��ู��ามรหัส��า����ว�า�ะ��ื�อม��อ�����รั���ร�"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:76
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "�ัว�ลือ��ี��ะ�ม�มี�ล��า�รว�����อมูลส�ว�หัว�ี��ำห���ว��ห�����ี��วาม�����ยะ"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "��อมูล�สริม"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "Or_ganization:"
 msgstr "_อ����ร:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "PGP/GPG _Key ID:"
 msgstr "�ื�อ_�ุ��� PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Pass_word:"
 msgstr "_รหัส��า�:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Port:"
 msgstr "�อร��:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "�าม��อ�ส����อ�วาม�ี�มี����ู�รั�สำ��า_ลั�ล�ว��"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
 msgid "Printed Fonts"
 msgstr "���อั�ษรสำหรั��าร�ั��ิม��"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "Proxy Settings"
 msgstr "��า�ั���ร�อ��ี"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "Quoted"
 msgstr "อ�า��ำ�ู�"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Re_member password"
 msgstr "_�ำรหัส��า�"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "Re_ply-To:"
 msgstr "_�ี�อยู��อ��ลั�:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "Remember _password"
 msgstr "�ำ_รหัส��า�"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "Required Information"
 msgstr "��อมูล�ำ����"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:96
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:97
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:98
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:100
 msgid "SSL is not supported in this build of Evolution"
 msgstr "�ม�รอ�รั� SSL �� Evolution �ี��อม��ล�มา�ี�"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
 msgid "S_earch for sender photograph only in local address books"
 msgstr "���_หารู��อ��ู�ส���า�สมุ��ี�อยู�����รื�อ�"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
 msgid "S_elect..."
-msgstr "�_ลือ�..."
+msgstr "_�ลือ�..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
 msgid "S_end message receipts:"
 msgstr "_ส���าร����รั���อ�วาม:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
 msgid "S_tandard Font:"
 msgstr "���อั�ษร_มา�ร�า�:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
 msgid "Select Drafts Folder"
 msgstr "�ลือ���ล��อร�������อ�วาม��ั�ร�า�"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:108
 msgid "Select HTML fixed width font"
 msgstr "�ลือ����อั�ษร�วาม�ว�า����ี�สำหรั� HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
 msgid "Select HTML fixed width font for printing"
 msgstr "�ลือ����อั�ษร�วาม�ว�า����ี�สำหรั��ิม�� HTML"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:110
 msgid "Select HTML variable width font"
 msgstr "�ลือ����อั�ษร�วาม�ว�า��ม����ี�สำหรั� HTML"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:111
 msgid "Select HTML variable width font for printing"
 msgstr "�ลือ����อั�ษร�วาม�ว�า��ม����ี�สำหรั��ิม�� HTML"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:112
 msgid "Select Sent Folder"
 msgstr "�ลือ���ล��อร�������อ�วามออ�"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:113
 msgid "Sender Photograph"
 msgstr "รู��ู�ส��"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:114
 msgid "Sending Mail"
 msgstr "�ารส���มล"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "�_�ล��อร���อ�วามออ�:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:116
 msgid "Sent and Draft Messages"
 msgstr "��อ�วาม�ี�ส���ละ��ั�ร�า�"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "��ิร���วอร���อ��าร�าร_ยื�ยั��ัว�ุ��ล"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "��า�ั����ิร���วอร�"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "_��ิ���ิร���วอร�:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:120
+msgid "Si_gning algorithm:"
+msgstr "อัล�อริ_�ึม�อ�ลาย����:"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "_ลาย����"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "��_รั�รอ�ลาย����:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "_ลาย����:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "ลาย����"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
+msgid "Signing _algorithm:"
+msgstr "อัล�อริ�ึม�อ�ลา_ย����:"
+
+#: ../mail/mail-config.ui.h:126
 msgid "Spell Checking"
 msgstr "�าร�รว��ัวสะ��"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:127
 msgid "Start _typing at the bottom on replying"
 msgstr "�ริ�ม�ิม���อ��ี�_��าย��อ�วาม"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:129
 msgid "T_ype:"
 msgstr "_��ิ�:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:130
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ราย�ื�อภาษา���ี��ี� �ะมี���าะภาษา�ี��ุ��ิ��ั�����า�ุ�รม�ว����า�ั��"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12527,7 +12479,12 @@ msgstr ""
 "�ลลั����อ�ส�ริ����ี��ะ�ู��������ลาย�����อ��ุ�\n"
 "�ื�อ�ี��ุ��ำห�� �ะ�����ื�อ�ส���มื�ออ�า�อิ��ึ����า�ั��"
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:135
+msgid "Top Posting Option"
+msgstr "�ัว�ลือ��าร�อ��ั�����มล"
+
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12535,187 +12492,189 @@ msgstr ""
 "�รุ�า��อ��ื�อ�ี��ุ���อ��าร����รีย��ั��ี�ี�\n"
 "�ัวอย�า�����: \"�า�\" หรือ \"ส�ว��ุ��ล\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:138
 msgid "Us_ername:"
 msgstr "_�ื�อ�ู����:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:139
 msgid "Use Authe_ntication"
 msgstr "����ารยื�ยั�_�ัว�ุ��ล"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:140 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_�ื�อ�ู����:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:141
 msgid "V_ariable-width:"
 msgstr "�วาม�ว�า��_ม����ี�:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "�_�ิ�มลาย����"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "�หล�รู�ภา��า�อิ���อร������_สมอ"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "��ิ��อ��าร_ยื�ยั��ัว�ุ��ล"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:145
 msgid "_Default junk plugin:"
 msgstr "_�ลั��อิ��รว��ยะ�ริยาย:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "��ื�อม��ออิ���อร�������ย_�ร�"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "�_ม���อ������ำ�ั��ารร�อ��อ��ี�ยว�ั��าร�ระ�ุม (��ื�อ�วาม���า�ั�����ั� Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "รู�����ารส���มล_��อ:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep Signature above the original message on replying"
 msgstr "�ห�_ลาย����อยู��ห�ือ��อ�วาม��ิม���าร�อ�"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_ภาษา"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images in messages from contacts"
 msgstr "�_หล�รู�ภา����าะ����อ�วาม�ี�มา�า��ู��ิ���อ"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "_��ิ�หา�ี�อยู��า�สมุ��ี�อยู�����รื�อ����า�ั��"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_�ำห���ห������ั��ีหลั�"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "��า�ร�อ��ี_�ำห���อ�:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:155
 msgid "_Mark messages as read after"
 msgstr "�ำ��รื�อ�หมาย��อ�วามว�า_อ�า��ล�วหลั��า�"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "�_ม��หล�รู�ภา��า�อิ���อร�����"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "_�า�:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_�าม��อ�ส����อ�วาม HTML ��ยั��ู��ี��ม���อ��าร"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�าม��อ�ส����อ�วาม�ี��ม�มี_หัว��อ�รื�อ�"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "รู�����าร�อ_�:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_ส�ริ���:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "�ร�อ��ี HTTP _�ิรภัย:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "��ิร�_��วอร�:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:167
 msgid "_Show image animations"
 msgstr "�_ส��ภา���ลื�อ��หว"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�_ส��รู��อ��ู�ส������อ��ส���ัวอย�า���อ�วาม��วย"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:170
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_�ำ�ั��ี�อยู�ส�ว�หัว �ึ� / สำ��า�ึ� / สำ��าลั��ึ� �ม���ิ�"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:171
 msgid "_Use Secure Connection:"
 msgstr "�_���าร��ื�อม��อ����ิรภัย:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:172
 msgid "_Use system defaults"
 msgstr "�����า_�ริยาย�อ�ระ��"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:173
 msgid "_Use the same fonts as other applications"
 msgstr "�_�����อั�ษร�หมือ���ร��รมอื���"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
 # in "_Shrink To / Cc / Bcc headers to ... addresses"
 # -> "_�ำ�ั��ี�อยู�ส�ว�หัว �ึ� / สำ��า�ึ� / สำ��าลั��ึ� �ม���ิ� ... ราย�าร"
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:176
 msgid "addresses"
 msgstr "ราย�าร"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:177 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
 # in "Highlight _quotations with ... color"
 # -> "�����ารอ�า�_�ำ�ู���วยสี ... "
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:178
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:179
 msgid "description"
 msgstr "�ำอ�ิ�าย"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "��ล��อร�ระยะ��ล�ี�����า�อยู��ั��หม�"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "��ล��อร�����รื�อ��ละ��ล��อร�ระยะ��ล�ี����อยู��ั��หม�"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "��ล��อร�����รื�อ��ั��หม�"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "�รีย�"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "�_สร���ล�ว"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "ยุ�_�ั��หม�"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "ลาย�����ิ�ิ�ัล"
@@ -12725,58 +12684,66 @@ msgid "Do Not Forward"
 msgstr "�ม���อ�ส����อ"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "_�ยาย�ั��หม�"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "�าร���ารหัสลั�"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "�าร�อ�รั���อมูล�อ���ล��อร�"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "��ะ�ระ�าศ�อ�"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "������ื�อ�รา�"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "ส����อ"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "��อ��ล�สั��าอ�ุ�า�"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "�ม��ำ������อ��อ�"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "�อ��ึ��ุ���"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "�รว��า�"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "��ิร�_��วอร�:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr ""
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "�หล��สำหรั���ล��อร����หา"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "��อมูลระ��รั�ษา�วาม�ลอ�ภัย"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "��าะ����ล��อร�"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12784,170 +12751,170 @@ msgstr ""
 "��อ�วาม��อ���ี� �ือ��อ�วาม�ี��ุ��ลือ��ว���ื�อ�ิ��าม�ระ�ู�\n"
 "�รุ�า�ลือ���ิ�ั�ิ�าร�ิ��าม�ระ�ู��า��ม�ู \"��\""
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_ยอมรั�สั��าอ�ุ�า�"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "�ระ�ำ_ภาย��:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "�_�:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "_�า�ี��ี���ื�อยอมรั���อ��ล���สั��าอ�ุ�า�"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:754
 #, c-format
 msgid "Pinging %s"
 msgstr "�ำลั� ping %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "�ำลั��รอ���อ�วาม�ี��ลือ�"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "�ำลั��ึ��มล"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:576
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "�ม�สามาร�����ัว�รอ��รอ��มลออ����: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "�ม�สามาร���ิ�ม��อมูล��อ��าย %s ���: %s\n"
-"�ะ��ิ�ม��อ��าย��ล��อร� `ส���ล�ว' ����รื�อ����"
+"�ะ��ิ�ม��อ��าย��ล��อร� 'ส���ล�ว' ����รื�อ����"
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:633
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "�ม�สามาร���ิ�ม��อมูล��อ��าย��ล��อร� `ส���ล�ว' ����รื�อ����: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "�ม�สามาร���ิ�ม��อมูล��อ��าย��ล��อร� 'ส���ล�ว' ����รื�อ����: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
 msgid "Sending message"
 msgstr "�ำลั�ส����อ�วาม"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:754
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�ำลั�ส�� %d ��อ�วาม �า� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:781
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "�ม�สามาร�ส�� %d ��อ�วาม �า� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "ย��ลิ�"
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "�สร���ล�ว"
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:897
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "�ำลั��ั��ึ���อ�วามล�����ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "�ำลั�ย�าย��อ�วาม��ยั� '%s'"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "�ำลั��ั�ลอ���อ�วาม��ยั� '%s'"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1083
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "�ำลั��รว���ล��อร���า�� �� '%s'"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1191
 msgid "Forwarded messages"
 msgstr "��อ�วามส����อ"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1232
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "�ำลั���ิ���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1298
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "�ำลั��ึ���อมูล��ว��าสำหรั���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "�ำลั���ิ��หล������ '%s'"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1441
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "�ำลั�ล���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1561
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ำลั�������อมูล�อ���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "�ำลั������วา��ละ������อมูล�อ��ั��ี '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1625
 #, c-format
 msgid "Storing account '%s'"
 msgstr "�ำลั�������อมูล�อ��ั��ี '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "�ำลั��หล���ล��อร� '%s' �หม�"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1719
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "�ำลั������วา���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1764
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "�ำลั����ยะ�� '%s' �ิ��"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1765
 msgid "Local Folders"
 msgstr "��ล��อร�����รื�อ�"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1961
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "�ำลั��ึ� %d ��อ�วาม"
 msgstr[1] "�ำลั��ึ� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2050
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�ำลั��ั��ึ� %d ��อ�วาม"
 msgstr[1] "�ำลั��ั��ึ� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2131
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12956,11 +12923,11 @@ msgstr ""
 "��ิ���อ�ิ��ลา���ะ�ั��ึ���อ�วาม��ยั�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2203
 msgid "Saving attachment"
 msgstr "�ำลั��ั��ึ����ม���"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12969,35 +12936,35 @@ msgstr ""
 "�ม�สามาร�สร�า����ม�ลลั���: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2244
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ม�สามาร���ีย���อมูล: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "�ำลั��ั��าร��ื�อม��อ�า� '%s'"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2389
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "�ำลั���ื�อม��อ�หม���ยั� '%s'"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2485
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "�ำลั���รียมออ��ล���ั��ี '%s'"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2571
 msgid "Checking Service"
 msgstr "�ำลั��รว�สอ��ริ�าร"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "�ำลั�ย��ลิ�..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "รั� & ส���มล"
 
@@ -13005,106 +12972,135 @@ msgstr "รั� & ส���มล"
 msgid "Cancel _All"
 msgstr "ย��_ลิ��ั��หม�"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "�ำลั��รั���อมูล..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "�ำลั�รอ..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "�ำลั��รว�สอ��มล�หม�"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:219
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "��อ�วลีรหัส��า�สำหรั� %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:221
 msgid "Enter Passphrase"
 msgstr "��อ�วลีรหัส��า�"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:224
 #, c-format
 msgid "Enter Password for %s"
 msgstr "��อ�รหัส��า�สำหรั� %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:226
 msgid "Enter Password"
 msgstr "��อ�รหัส��า�"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:268
 msgid "User canceled operation."
 msgstr "�ู����ย��ลิ���ิ�ั�ิ�าร"
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:678
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "�ม�มี�ี�อยู��ลาย�า� ย��ลิ��ารส����อ��อ�วาม"
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:684
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "�ม�มี�ั��ี�ี��ะ��� ย��ลิ��ารส����อ��อ�วาม"
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "�ม�สามาร�สร�า����ร��อรี�ี������ั� `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "�ม�สามาร�สร�า����ร��อรี�ี������ั� '%s': %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "�ำลั��ยายาม��� movemail �ั��หล�� `%s' �ึ���ม���� mbox"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "�ำลั��ยายาม��� movemail �ั��หล�� '%s' �ึ���ม���� mbox"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��อ�วามส����อ - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "��อ�วามส����อ"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "��ล��อร�����ม����: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "��ล��อร�����ม����: '%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "�ำลั��ั����า��ล��อร����หา: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:228
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "�ำลั��รั���อมูล��ล��อร����หาสำหรั� '%s:%s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "�ำลั��รั���อมูล��ล��อร����หาสำหรั� '%s'"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1188
 msgid "Edit Search Folder"
 msgstr "�������ล��อร����หา"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1293
 msgid "New Search Folder"
 msgstr "สร�า���ล��อร����หา�หม�"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "\"�รว��มล�ยะ\" �ม�สำ�ร��"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "\"ราย�า���อ�วาม�ยะ\" �ม�สำ�ร��"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"ราย�า���อ�วาม�ม�����ยะ\" �ม�สำ�ร��"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "มี��ล��อร��ื�อ \"{0}\" อยู��ล�ว �รุ�า����ื�ออื��"
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "มี��ล��อร��ื�อ \"{1}\" อยู��ล�ว �รุ�า����ื�ออื��"
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13115,134 +13111,122 @@ msgstr ""
 "\n"
 "�ุ�สามาร���าม��ล��อร��ี��� ��ีย��ั� หรือ��ีย���อ��าย��อมูล��ิม หรือ�ลิ��ำ�����"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr "\"{1}\" ร�อ��อ�าร����รั���อ�วาม �ะ�����ลั���ยั� {0} หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "มีลาย�����ื�อ \"{0}\" อยู��ล�ว �รุ�า����ื�ออื��"
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr "�าร��ิ�มหัว��อ�รื�อ�����อ�วาม �ะ��วย�ห��ู�รั����า����ี�ยว�ั��ุ��ระส����อ���หมาย�ุ�"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารล��ั��ี�ี� �ร�อม�ั���ัว����ั��หม�?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารล��ั��ี�ี�?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��าร������ั��ี�ี� �ร�อม�ั��ล��ัว����ั��หม�?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "�ุ������หรือ�ม� ว�า��อ��าร��ิ���อ�วาม�ั�� {0} ��อ�วาม�ร�อม� �ั�?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "�ุ������หรือ�ม� ว�า�ะ�วา���อ�วาม�ี�สั��ล��ว����ุ���ล��อร��ิ��อย�า��าวร?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "�ุ������หรือ�ม� ว�า�ะ�วา���อ�วาม�ี�สั��ล��ว�����ล��อร� \"{0}\" �ิ��อย�า��าวร?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��รู���� HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��วย�ี�อยู��ี�����าร�ม����?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��วย�ี�อยู��ี�����าร�ม����?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม�ี�มี����ู�รั�สำ��าลั�ล�ว��?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��ย�ม�มี�ื�อ�รื�อ�?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "��ราะ \"{0}\""
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "��ราะ \"{2}\""
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "ลาย������ล�า"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "�ม�สามาร���ิ�ม��ล��อร����หา \"{0}\""
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "�ม�สามาร��ั�ลอ���ล��อร� \"{0}\" ��ยั� \"{1}\""
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "�ม�สามาร�สร�า���ล��อร� \"{0}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "�ม�สามาร�สร�า����ร��อรี�ั��ึ��ั�ว�ราว"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "�ม�สามาร�สร�า����ร��อรี�ั��ึ� ��ื�อ��า� \"{0}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "�ม�สามาร�ล���ล��อร� \"{0}\""
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "�ม�สามาร�ล���ล��อร�ระ�� \"{0}\""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "�ม�สามาร��������ล��อร����หา \"{0}\" ��ราะ�ม�มี��ล��อร��ี�ว�า"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "�ม�สามาร�ย�าย��ล��อร� \"{0}\" ��ยั� \"{1}\""
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
 msgstr "�ม�สามาร���ิ��หล�� \"{1}\""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "�ม�สามาร���ิ��หล�� \"{2}\""
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "�ม�สามาร���ิ��หล���ลาย�า� \"{2}\""
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13250,35 +13234,31 @@ msgstr ""
 "�ม�สามาร�อ�า����มสั��าอ�ุ�า� \"{0}\" ��ื�อ��า��ั�หา��ี�ยว�ั��าร�ิ��ั�� "
 "�ุ��ะ�ม�สามาร���������อ����ี���� ���ว�า�ุ��ะยอมรั���ื�อ���สั��าอ�ุ�า��ี�"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "�ม�สามาร���ลี�ย��ื�อ \"{0}\" ���� \"{1}\""
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "�ม�สามาร���ลี�ย��ื�อหรือย�าย��ล��อร�ระ�� \"{0}\" ���"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "�ม�สามาร��ั��ึ��วาม��ลี�ย���ล����ั��ี"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "�ม�สามาร��ั��ึ������ร��อรี \"{0}\""
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "�ม�สามาร��ั��ึ�ล����ม \"{0}\""
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "�ม�สามาร��ำห��ส�ริ���ลาย���� \"{0}\""
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "�รว��มล�ยะ�ม�สำ�ร��"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13287,27 +13267,27 @@ msgstr ""
 "อย�าลืมว�ารหัส��า�ส�ว��ห���ย��วาม�����า�ระหว�า��ัว�ิม���ห��-�ล�� "
 "�า��ี�ุ�มล�อ���ร��อ��ุ�อา��ะ�ู�����า�อยู�"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "�ม�สามาร��ั��ึ����มลาย�������"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "ล���อ�วาม����ล��อร����หา \"{0}\" หรือ�ม�?"
 
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "�_ม��ิ�����า�"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "�_ม�ล�"
+msgid "Do _Not Send"
+msgstr "�_ม�ส��"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "�ม�ล�"
+msgid "Do _Not Synchronize"
+msgstr "�_ม��รั���อมูล"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "�ม��ิ�����า�"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13315,58 +13295,61 @@ msgstr ""
 "�ุ���อ��าร�รั���อมูล��ล��อร���า�� ภาย����รื�อ� "
 "�ี�มี�าร�ำ��รื�อ�หมายสำหรั��าร����า����ออ��ล��หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "�ุ���อ��าร�ำ��รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�วหรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ�หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "��อ�รหัส��า�"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "��ิ���อ�ิ��ลา�ระหว�า�อ�า���อ�ำห���ัว�รอ�"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "��ิ���อ�ิ��ลา�ระหว�า��ระ�ำ��ิ�ั�ิ�าร"
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "��ิ���อ�ิ��ลา���ะ{0}"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "���มมีอยู�����ม�สามาร���ีย��ั����"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "���มมีอยู�����ม�������ม���ิ"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "��า�ำ��ิ��าร��อ�� �ุ��ะ�ม�สามาร��รีย���อ�วาม�หล�า�ี��ื�มา���อี�"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "��า�ุ�ล���ล��อร� ��ื�อหา�ั��หม�����ล��อร��ละ��ล��อร�ย�อย�ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "��า�ุ�ล���ล��อร� ��ื�อหา�ั��หม�����ล��อร��ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "��า�ุ��ำ��ิ��าร��อ�� ��อมูล�ั��ี�ัว����ั��หม��ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13374,33 +13357,33 @@ msgstr ""
 "��า�ุ��ำ��ิ��าร��อ�� ��อมูล�ั��ี�ู�����ละ�ัว����ั��หม�\n"
 "�ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "��า�ุ��ำ��ิ��าร��อ�� ��อมูล�ั��ี�ู�����ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "��า�ุ�หยุ� ��อ�วาม�หล�า�ี��ะ�ม��ู�ส���� ���ว�า Evolution �ะ�ริ�ม�ำ�า��หม�อี�"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "�ม�ส���"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "�ารยื�ยั��ัว�ุ��ล�ม��ู���อ�"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "ล��มล�ม�สำ�ร��"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "�รั���อมูล�ัว�รอ��มล��ยอั���มั�ิ�ล�ว"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13411,27 +13394,27 @@ msgstr ""
 "�ึ����อมูล�ี��ะ�ส���ู�รั��ั��หม��อ���อ�วามอยู��ี �ุ�สามาร��ลี�ย��าร�ส����อมูล�ั��ล�าว��� "
 "��ย��ิ�ม�ู�รั�����อ� �ึ�: หรือ สำ��า: อย�า���อยห�ึ����"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "��ล��อร��า�หาย��"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "�ม�����ลือ��หล���ว�"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "�าร��ิ���อ�วามมา���ิ��������ละ�รั��อา��ะ��อ��ิ��วลา�า�"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "�รุ�า�รว�สอ��าร�ั����า�ั��ี�อ��ุ��ละลอ��หม�อี��รั��"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "�รุ�า��ิ�����ั��ี หรือ�ม���ส����วย�ั��ีอื��"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13439,7 +13422,7 @@ msgstr ""
 "�รุ�า��อ��ี�อยู�อี�มล�ี��ะส������อ� \"�ึ�:\" �ุ�สามาร�����ี�อยู�อี�มล�����ย���ุ�ม \"�ึ�:\" "
 "�ี�อยู��ั��า���อ���ิม��อ�วาม"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13448,63 +13431,47 @@ msgstr ""
 "�รุ�า�รว�สอ��ู�ห������ ว�า�ู�รั���ราย�ื�อ�หล�า�ี�สมั�ร���ละสามาร�รั��มล��รู���� HTML ���:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "�รุ�า�ั���ื�อ�ี��ม���ำ�ั��ื�ออื��สำหรั�ลาย�����ี�"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "�รุ�ารอสั��รู�"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "��ิ��ั�หา��ะย�าย��อมูล��ล��อร��มล���า \"{0}\""
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "�ำลั�สอ��ามราย�ื�อ�ล���ารยื�ยั��ัว�ุ��ล�ี���ิร���วอร�รอ�รั�"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "ร�อ��อ�าร����รั���อ�วาม�ล�ว"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ยื�ยั�ว�า�ะล���ล��อร� \"{0}\" �ละ��ล��อร�ย�อย�ั��หม�หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "ยื�ยั�ว�า�ะล���ล��อร� \"{0}\" หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "ราย�า���อ�วาม�ยะ�ม�สำ�ร��"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "ราย�า���อ�วาม�ม�����ยะ�ม�สำ�ร��"
-
 #: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "�รั���อมูล��ล��อร����หา��ยอั���มั�ิ�ล�ว"
 
 #: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "ส���าร����รั�"
-
-#: ../mail/mail.error.xml.h:92
 msgid "Signature Already Exists"
 msgstr "ลาย����มีอยู��ล�ว"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "�รั���อมูล"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize folders locally for offline usage?"
 msgstr "�ะ�รั���อมูล��ล��อร�ภาย����รื�อ� ��ื�อ�าร����า����ออ��ล��หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13512,7 +13479,7 @@ msgstr ""
 "Evolution �ำ������อ������ล��อร�ระ�� �ึ��ะ�ำ�า����อย�า��ู���อ� �ึ��ม�สามาร���ลี�ย��ื�อ ย�าย "
 "หรือล����"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13527,35 +13494,7 @@ msgstr ""
 "�ึ����อมูล�ี��ะ�ส���ู�รั��ั��หม��อ���อ�วามอยู��ี �ุ�สามาร��ลี�ย��าร�ส����อมูล�ั��ล�าว��� "
 "��ย��ิ�ม�ู�รั�����อ� �ึ�: หรือ สำ��า: อย�า���อยห�ึ����"
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"��ล��อร����หา��อ���ี�:\n"
-"{0}\n"
-"�����ล��อร���อ���ี� �ึ���ู�ล����ล�ว:\n"
-"    \"{1}\"\n"
-"�ละ����รั���อมูล�หม��ล�ว"
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"���าร�รอ���อ���ี�:\n"
-"{0}\n"
-"�����ล��อร���อ���ี� �ึ���ู�ล����ล�ว:\n"
-"    \"{1}\"\n"
-"�ละ����รั���อมูล�หม��ล�ว"
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13563,7 +13502,7 @@ msgstr ""
 "�ู�รั���อ���ี�มี�ี�อยู��ี��ิ��า�รู�����อ��ี�อยู��มล:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13571,11 +13510,11 @@ msgstr ""
 "�ู�รั���อ���ี�มี�ี�อยู��ี��ิ��า�รู�����อ��ี�อยู��มล:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:101
 msgid "The script file must exist and be executable."
 msgstr "ส�ริ�����อ�มีอยู� �ละ��อ�สามาร��รีย��ำ�า����"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13583,57 +13522,61 @@ msgstr ""
 "��ล��อร��ั��ล�าวอา��ู���ิ�ม���ามา��ย�ัย\n"
 "�รุ�า���ี���รื�อ�มือ�������ล��อร����หา��ื�อ��ิ�ม��ล��อร��ั��ล�าวอย�า��ั����� หา���อ��าร"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "�ม�สามาร�ส����อ�วาม�ี���� ��ราะ�ั��ี�ี��ุ��ลือ�ยั��ม���ิ����"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "�ม�สามาร�ส����อ�วาม�ี���� ��ราะ�ุ��ม����ระ�ุ�ื�อ�ู�รั�"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "��ิร���วอร��ี��ม�รอ�รั��ารยื�ยั��ัว�ุ��ลวิ�ี�ี� �ละอา��ม�รอ�รั��ารยื�ยั��ัว�ุ��ลวิ�ี���ลย"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:107
 msgid "This signature has been changed, but has not been saved."
 msgstr "ลาย�����ี�มี�าร��ลี�ย���ล� ���ยั��ม�����ั��ึ�"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "�ะ�ำ��รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว����ล��อร��ี��ลือ��ละ����ล��อร�ย�อย�ั��หม�"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:109
+msgid "This will mark all messages as read in the selected folder."
+msgstr "�ะ�ำ��รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว����ล��อร��ี��ลือ�"
+
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� GroupWise"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 "�ม�สามาร���ิ���ล��อร���หมายร�า�สำหรั��ั��ี�ี���� �ะ�����ล��อร���หมายร�า��อ�ระ�����หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "�ม�สามาร�อ�า����มสั��าอ�ุ�า�"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "�����ล��อร�_�ริยาย"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "�����ล��อร���หมายร�า��ริยายหรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13643,31 +13586,31 @@ msgstr ""
 "�อ��ุ���วย\n"
 "ยั�ยื�ยั��ี��ะล�หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "�ุ��ม�มีสิ��ิ���ีย��อ�ี��ะล��มล�ี�"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "�ุ���ิม��อมูล�ั��ั��ม��ร�"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "�ุ�มี��อ�วาม�ี�ยั��ม����ส�� �ุ���อ��ารออ��า���ร��รมหรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "�ุ��ม�สามาร�สร�า�สอ��ั��ี��วย�ื�อ��ียว�ั����"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "�ุ���อ��ั���ื�อ��ล��อร����หา�ี���วย"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "�ุ���อ�ระ�ุ��ล��อร�"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13677,115 +13620,121 @@ msgstr ""
 "อา��ะ��ย�ลือ�����ราย��ล��อร� �ละ/หรือ ��ย�ลือ���ล��อร�����รื�อ��ั��หม� "
 "��ล��อร�����รือ��าย�ั��หม� หรือ�ั��สอ�อย�า�"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "�ารล��ั��ึ����า�����ิร���วอร� \"{0}\" �อ��ุ����ื�อ \"{0}\" ล�ม�หลว"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "�_�ิ�ม��อ��าย"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_�ิ�����า�"
+
+#: ../mail/mail.error.xml.h:128
 msgid "_Discard changes"
 msgstr "�_ม�ส����าร��ลี�ย���ล�"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "�_ม��รั���อมูล"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "�_��ยะ"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "�_����วา�"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "�_�ิ���อ�วาม"
 
-#: ../mail/message-list.c:1119
+#: ../mail/mail.error.xml.h:134
+msgid "_Send Receipt"
+msgstr "_ส���าร����รั�"
+
+#: ../mail/mail.error.xml.h:135
+msgid "_Synchronize"
+msgstr "_�รั���อมูล"
+
+#: ../mail/message-list.c:1113
 msgid "Unseen"
 msgstr "ยั��ม�อ�า�"
 
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1114
 msgid "Seen"
 msgstr "อ�า��ล�ว"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1115
 msgid "Answered"
 msgstr "�อ��ล�ว"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1116
 msgid "Forwarded"
 msgstr "ส����อ�ล�ว"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1117
 msgid "Multiple Unseen Messages"
 msgstr "��อ�วามยั��ม�อ�า�หลาย��ั�"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1118
 msgid "Multiple Messages"
 msgstr "��อ�วามหลาย��ั�"
 
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1122
 msgid "Lowest"
 msgstr "��ำ�ี�สุ�"
 
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1123
 msgid "Lower"
 msgstr "��ำ�ว�า"
 
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1127
 msgid "Higher"
 msgstr "สู��ว�า"
 
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1128
 msgid "Highest"
 msgstr "สู��ี�สุ�"
 
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1738 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1745 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "วั��ี� %l:%M %p"
 
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1754
 msgid "Yesterday %l:%M %p"
 msgstr "�มื�อวา� %l:%M %p"
 
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1766
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1774
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1776
 msgid "%b %d %Y"
 msgstr "%d %b %Ey"
 
-#: ../mail/message-list.c:2528
+#: ../mail/message-list.c:2531
 msgid "Select all visible messages"
 msgstr "�ลือ���อ�วาม�ั��หม��ี�มอ��ห��"
 
-#: ../mail/message-list.c:2579 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr "�����อ�����ลล�"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
+#: ../mail/message-list.c:4216 ../mail/message-list.c:4610
 msgid "Generating message list"
 msgstr "�ำลั�สร�า�ราย�าร��อ�วาม"
 
-#: ../mail/message-list.c:4763
+#: ../mail/message-list.c:4449
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13793,15 +13742,7 @@ msgstr ""
 "�ม�มี��อ�วาม�ี��ร��ั���ื�อ����าร���หา�อ��ุ� �รุ�าล�า��าร���หา��วย�ม�ู ���หา->ล�า� "
 "หรือ��ลี�ย���ื�อ���"
 
-#: ../mail/message-list.c:4765
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"��ล��อร��ี�มี�����อ�วาม��อ� �รุ�า����ม�ู \"มุมมอ�\"->\"�ส����อ�วาม�ี���อ��ว�\" "
-"��ื�อสั���ส����อ�วาม�ั��ล�าว"
-
-#: ../mail/message-list.c:4767
+#: ../mail/message-list.c:4451
 msgid "There are no messages in this folder."
 msgstr "�ม�มี��อ�วาม����ล��อร��ี�"
 
@@ -13830,7 +13771,7 @@ msgid "Sent Messages"
 msgstr "��อ�วาม�ี�ส��"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "��า�"
 
@@ -13839,27 +13780,27 @@ msgid "Subject - Trimmed"
 msgstr "�ื�อ�รื�อ� - �ั�ส�ว���าย"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "�ัว��หมายมี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "��ื�อ�วามมี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "�ู�รั�มี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "�ู�ส��มี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "�ื�อ�รื�อ�มี�ำว�า"
 
@@ -13892,15 +13833,15 @@ msgstr ""
 "�าร�ลือ��ัว�ลือ��ี�หมาย�วามว�า��ิร���วอร��อ��ุ��ม�รอ�รั��ั�� SSL หรือ TLS "
 "�ึ����หมาย�วามว�า�าร��ื�อม��อ�อ��ุ��ะ�ม��ิรภัย �ละ�สี�ย���อ�ารลั�ลอ������อมูล���"
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "�������ิ�ิ�_วั���ิ� & วั��ร�รอ��ี"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "�ั�ลอ���ื�อหา_สมุ��ี�อยู��ว��ี���รื�อ���ื�อ�าร�ำ�า����ออ��ล��"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13909,7 +13850,7 @@ msgstr ""
 "�ี��ือ�อร������ิร���วอร� LDAP �ี� Evolution �ะ��ื�อม��อ�� �ื�อ�อ��อร��มา�ร�า��ะมี�ว��ห�อยู��ล�ว "
 "�ะ��อ��าม�ู��ู�ลระ���อ��ุ�ว�า�อร���ห��ี��ุ���อ�ระ�ุ"
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13918,7 +13859,7 @@ msgstr ""
 "�ี��ือวิ�ี�ี� Evolution �ะ���ยื�ยั��ัว�ุ��ล�อ��ุ� สั����ว�า�าร�ั����า���� \"�ี�อยู�อี�มล\" "
 "�ะ��อ����า�ึ���ิร���วอร� LDAP �อ��ุ�����ิร�าม�����วย"
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13929,29 +13870,29 @@ msgstr ""
 "\"ย�อย\" �ะรวม�ุ�ราย�าร�ี�อยู�����ุ��ั��������หา�อ��ุ� �อ�����าร���หา \"ระ�ั���ียว\" "
 "�ะรวมราย�าร�ี�อยู�����ุ��ั��������หา�อ��ุ���ีย�ระ�ั���ียว���า�ั��"
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "��อมูล��ิร���วอร�"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "รายละ�อีย�"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "�าร���หา"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "�าร�าว���หล�"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "�ุ�สม�ั�ิสมุ��ี�อยู�"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "สมุ��ี�อยู��หม�"
 
@@ -14030,9 +13971,11 @@ msgstr "�ำห��ว�า�ะ�ั��ั��ห��ส���
 msgid "Whether to show the preview pane."
 msgstr "�ำห��ว�า�ะ�ส����อ��ส���ัวอย�า�หรือ�ม�"
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "�อลัม���ารา�:"
+#: ../modules/mail/em-mailer-prefs.c:1160
+msgid "_Table column:"
+msgstr "_�อลัม���ารา�:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14043,393 +13986,291 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "�_ส���ี�อยู��อ��ู��ิ���อ�ี���ิม���มอั���มั�ิ�สมอ"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:191
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "����ิร���วอร� LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:341
 msgctxt "New"
 msgid "_Contact"
 msgstr "�ี�อยู�_�ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:343
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "สร�า��ู��ิ���อ�หม�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ราย_�ื�อ�ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:350
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "สร�า�ราย�ื�อ�ู��ิ���อ�หม�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:358
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_สมุ��ี�อยู�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "สร�า�สมุ��ี�อยู��หม�"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/addressbook/e-book-shell-backend.c:377
+#: ../modules/addressbook/e-book-shell-view.c:398
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "�ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "ราย�ื�อ�หล��"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "�ะ��ีย��อ�สมุ��ี�อยู�"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "มุมมอ��ั��ุ�ั�"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "มุมมอ��ี��ลือ����ั��ุ�ั��อ�สมุ��ี�อยู�"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "�ู��ิ���อ�ี��ำลั��ส���ัวอย�า�"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "�ู��ิ���อ�ี��ำลั��ส��อยู�����อ��ส���ัวอย�า�"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "��อ��ส���ัวอย�า��รา��อยู�"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "�ำห��ว�า����ส����อ��ส���ัวอย�า�อยู�หรือ�ม�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "��ิร���วอร� LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "�าร�ั����า�าร��ิม���ม�ำอั���มั�ิ"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ำ�ห����ละ��ร�สร�า��อ���ล��อร��ู��ิ���อ�อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
-"\n"
-"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"รู�����อ��าร�ิ���อ�มลลิ�ลิส��มี�าร��ลี�ย���ล�\n"
-"\n"
-"�รุ�ารอ ����ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"วิ�ี����หมาย�ล���รศั����อ� Evolution �����ลี�ย����ล�ว\n"
-"\n"
-"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"�ั��ึ��าร��ลี�ย���ล��อ��าร sync palm �อ� Evolution �����ลี�ย����ล�ว\n"
-"\n"
-"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��อมูล�าร sync pilot �อ��ุ�..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-msgid "Source Selector Widget"
-msgstr "วิ������ลือ��หล��"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "วิ������ี��ส���ลุ�ม��า�� �อ�สมุ��ี�อยู�"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "�ั��ึ����� vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "�ั�_ลอ��ู��ิ���อ�ั��หม���ยั�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "�ั�ลอ��ู��ิ���อ��สมุ��ี�อยู��ี��ลือ���ยั��ล�มอื��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "ล_�สมุ��ี�อยู�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "ล�สมุ��ี�อยู��ี��ลือ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "_ย�าย�ู��ิ���อ�ั��หม���ยั�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "ย�าย�ู��ิ���อ��สมุ��ี�อยู��ี��ลือ���ยั��ล�มอื��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "สมุ��ี�อยู��_หม�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "�ุ�สม�ั�ิ_สมุ��ี�อยู�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "�ส���ุ�สม�ั�ิ�อ�สมุ��ี�อยู��ี��ลือ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "_Rename..."
 msgstr "��ลี�ย�_�ื�อ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "��ลี�ย��ื�อสมุ��ี�อยู��ี��ลือ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "�ั�_�ึ�สมุ��ี�อยู���รู� vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "�ั��ึ��ู��ิ���อ��สมุ��ี�อยู��ลือ���รู� vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "หยุ��หล�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_�ั�ลอ��ู��ิ���อ��ยั�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "�ั�ลอ��ู��ิ���อ�ี��ลือ���ยั�สมุ��ี�อยู��ล�มอื��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_ล��ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_หา����อมูล�ู��ิ���อ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "���หา��อ�วาม����อมูล�ู��ิ���อ�ี��ส��อยู�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "ส��_��อ��อมูล�ู��ิ���อ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "ส����อมูล�ู��ิ���อ�ี��ลือ����ห��ู�อื��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_ย�าย�ู��ิ���อ��ยั�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "ย�าย�ู��ิ���อ�ี��ลือ���ยั�สมุ��ี�อยู��ล�มอื��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "�ู��ิ���อ�_หม�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "_ราย�ื�อ�ู��ิ���อ�หม�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_��ิ���อมูล�ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "�ู��อมูล�ู��ิ���อ�ั��ุ�ั�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_ส����อ�วาม��ยั��ู��ิ���อ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "ส����อ�วาม��ยั��ู��ิ���อ�ี��ลือ�อยู�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_��ิ�ั�ิ�าร"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "_�ัวอย�า�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_ล�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "�ุ�_สม�ั�ิ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_�ั��ึ����� vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "�ู_�ัวอย�า��ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "�ส����อ�ห��า��า��ส���ัวอย�า��ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "มุมมอ��_����ั�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "�ส���ัวอย�า���อมูล�ู��ิ���อ���ราย�ื�อ�ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "มุมมอ���ว_�ั��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "�ส���ัวอย�า���อมูล�ู��ิ���อ��า�ราย�ื�อ�ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "หมว��������"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "�ม��ร��ั�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "�าร���หา�ั��สู�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "�ิม����อมูล�ู��ิ���อ�ั��หม��ี��ส��อยู�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "�ส���ัวอย�า���อมูล�ู��ิ���อ��อ��ิม��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "�ิม����อมูล�ู��ิ���อ�ี��ลือ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "�ั��ึ����� vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "�ั��ึ���อมูล�ู��ิ���อ�ี��ลือ���รู� vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "_ส����อ�ี�อยู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "_ส����อ�ี�อยู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "_ส����อ�วาม��ยั��ู��ิ���อ"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "_ส����อ�วาม��ยั�ลิส��"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "_ส����อ�วาม��ยั��ู��ิ���อ"
 
@@ -14453,57 +14294,47 @@ msgstr "��อมูล�ู��ิ���อ"
 msgid "Contact information for %s"
 msgstr "��อมูล�ี�อยู��ิ���อ�อ� %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "�ิร�าม"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "�_รีย��ูสมุ��ี�อยู��ี����ว�า�ะ�ึ��ี��ำ�ั��ี��ำห���ว�"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "�_��าระ��:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "ระ�ั���ียว"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "�ัว�รอ�สำหรั����หา"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_�ุ��ั��������หา:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "�ัว_�รอ�สำหรั����หา:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14512,55 +14343,56 @@ msgstr ""
 "�าร���หา��ย���ิ���ะหาอ�อ��������ิ� \"person\""
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "ย�อย"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "�ุ��ั��������หา�ี�รอ�รั�"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "�ะ��� distinguished name (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "�ะ����ี�อยู�อี�มล"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "_�ำ�ั��าร�าว���หล�:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_หา�ุ��ั��������หา�ี����������"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_วิ�ี�าร���าระ��:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_�อร��:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_�อ�����าร���หา:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "�ำ�ั��_วลา:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "�_���าร��ื�อม��อ�ิรภัย:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "�าม�ั�ร"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "�ำ�_��า"
 
@@ -14582,11 +14414,11 @@ msgstr "�ำ�_��า��ยั�ภาร�ิ�"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "���ว��"
 
@@ -14595,83 +14427,55 @@ msgstr "���ว��"
 msgid "Weather"
 msgstr "ราย�า�อา�าศ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:251
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "วั���ิ� & วั��ร�รอ��ี"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_�ั�หมาย"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "สร�า��ั�หมาย�หม�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:462
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "�ั�หมาย_�ลอ��ั��วั�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:464
 msgid "Create a new all-day appointment"
 msgstr "สร�า��าร�ระ�ุม�ลอ��ั��วั��หม�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:469
 msgctxt "New"
 msgid "M_eeting"
 msgstr "�าร_�ระ�ุม"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:471
 msgid "Create a new meeting request"
 msgstr "สร�า��าร�อ�าร�ระ�ุม�หม�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:479
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_��ิ�ิ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "สร�า���ิ�ิ��หม�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 msgid "Calendar and Tasks"
 msgstr "��ิ�ิ��ละภาร�ิ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "�ะ��ีย��อ���ิ�ิ�"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ำ�ห����ละ��ร�สร�า��อ���ล��อร���ิ�ิ��อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
-"\n"
-"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "�ม�สามาร�ย�าย��อมูล�าร�ั����า���า�า� evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "�ม�สามาร�ย�าย��อมูล��ิ�ิ� `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
 #: ../modules/calendar/e-memo-shell-sidebar.c:163
 #: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
@@ -14682,36 +14486,20 @@ msgstr ""
 "��ิ���อ�ิ��ลา��ี� %s\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:228
 msgid "Loading calendars"
 msgstr "�ำลั��หล���ิ�ิ�"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:617
+#: ../modules/calendar/e-cal-shell-sidebar.c:648
+msgid "_New Calendar..."
+msgstr "��ิ�ิ��_หม�..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:665
 msgid "Calendar Selector"
 msgstr "��อ��ลือ���ิ�ิ�"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:743
-msgid "Date Navigator Widget"
-msgstr "วิ�������อ��ู��ิ�ิ�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:744
-msgid "This widget displays a miniature calendar"
-msgstr "วิ������ี��ะ�ส����ิ�ิ���า��ล��"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:753
-msgid "Default Calendar Client"
-msgstr "��ร��รมลู���าย��ิ�ิ��ริยาย"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:754
-msgid "Default client for calendar operations"
-msgstr "��ร��รมลู���าย�ริยายสำหรั��าร�ระ�ำ��า�� �ั���ิ�ิ�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:764
-msgid "This widget displays groups of calendars"
-msgstr "วิ������ี��ะ�ส���ลุ�ม��า�� �อ���ิ�ิ�"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:952
+#: ../modules/calendar/e-cal-shell-sidebar.c:1007
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�ำลั���ิ���ิ�ิ��ี� %s"
@@ -14740,298 +14528,298 @@ msgstr "ล��ห�ุ�าร���ี����า�ว�า"
 msgid "Copying Items"
 msgstr "�ำลั��ั�ลอ�ราย�าร"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "�ำลั�ย�ายราย�าร"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "�ห�ุ�าร��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:503
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "�ั��ึ����� iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Copy..."
 msgstr "_�ั�ลอ�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "_ล���ิ�ิ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "ล���ิ�ิ��ี��ลือ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "ย�อ��ลั�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "����า�ห��า"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "�ลือ�_วั��ี�"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "�ลือ�วั��ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "�ลือ�วั�_�ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "ระ�ุวั��ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "��ิ�ิ��_หม�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "�_����วา�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "ล��ั�หมาย�ละ�าร�ระ�ุม���า�ิ��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "�รั��_ส��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "�รั���อมูล��ิ�ิ��ี��ลือ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "��ลี�ย��ื�อ��ิ�ิ��ี��ลือ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "�_ส�����าะ��ิ�ิ��ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "_�ั�ลอ���ยั���ิ�ิ�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "มอ�หมาย�ระ�ุม�_��..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "_ล��ั�หมาย"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "ล��ั�หมาย�ี��ลือ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "_ล��ั�หมายรอ��ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "ล��ั�หมายรอ��ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "ล��ุ_�รอ��อ��ั�หมาย"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "ล��ุ�รอ��อ��ั�หมาย�ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "�_ห�ุ�าร���ั��วั�ราย�าร�หม�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "สร�า��ห�ุ�าร���ลอ��ั��วั�ราย�าร�หม�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "ส��_��อ���� iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "�าร�ระ�ุม�_หม�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "สร�า��าร�ระ�ุมราย�าร�หม�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "_ย�าย��ยั���ิ�ิ�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "�ั�หมาย�_หม�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "�ห��ห�ุ�าร���รั���ี��_�ลื�อ�ย�าย���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "�_�ิ��ั�หมาย"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "�ู�ั�หมาย�ั��ุ�ั�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "_�อ��ลั�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "�ั��ึ����� iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "_�ั��วลา�ระ�ุม..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "��ล��ั�หมาย�ห������าร�ระ�ุม"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "��ล_������ั�หมาย..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "��ล��าร�ระ�ุม�ห������ั�หมาย"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "ออ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "วั�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "�ส��วั���ียว"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "ราย�าร"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "�ส������ราย�าร"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "��ือ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "�ส����ือ���ียว"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "สั��าห�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "�ส��สั��าห���ียว"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "�ส��สั��าห��ำ�า�สั��าห���ียว"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "�ั�หมาย�ี�มี�ลอยู�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "�ั�หมาย�อ� 7 วั���า�ห��า"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "�ำอ�ิ�ายมี�ำว�า"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "สรุ�มี�ำว�า"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "�ิม����ิ�ิ��ี�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "�ส���ัวอย�า���ิ�ิ���อ��ิม��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "��ยั�"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-memo-shell-view-actions.c:501
 msgid "memo"
 msgstr "�ั��ึ���วย�ำ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "New _Memo"
 msgstr "�ั�_�ึ���วย�ำ�หม�"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Create a new memo"
 msgstr "สร�า��ั��ึ���วย�ำราย�าร�หม�"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "_Open Memo"
 msgstr "_��ิ��ั��ึ���วย�ำ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "View the selected memo"
 msgstr "�ู�ั��ึ���วย�ำ�ี��ลือ�"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "��ิ�ห��า_�ว��"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Print the selected memo"
 msgstr "�ิม���ั��ึ���วย�ำ�ี��ลือ�"
 
@@ -15040,22 +14828,22 @@ msgstr "�ิม���ั��ึ���วย�ำ�ี��ลือ
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "ภาร�ิ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_มอ�หมายภาร�ิ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_�ำ��รื�อ�หมายว�า�สร���ล�ว"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�า�สร���ล�ว"
 
@@ -15064,39 +14852,39 @@ msgid "_Mark as Incomplete"
 msgstr "_�ำ��รื�อ�หมายว�ายั��ม��สร��"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�ายั��ม��สร��"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "ภาร�ิ��_หม�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "สร�า�ภาร�ิ�ราย�าร�หม�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_��ิ�ภาร�ิ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "�ูภาร�ิ��ี��ลือ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "�ั��ึ����_� iCalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "�ิม��ภาร�ิ��ี��ลือ�"
 
@@ -15120,40 +14908,20 @@ msgid "Memo Li_st"
 msgstr "_ราย�าร�ั��ึ���วย�ำ"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "สร�า�ราย�าร�ั��ึ���วย�ำราย�าร�หม�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "�ะ��ีย��อ�ราย�าร�ั��ึ���วย�ำ"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "����ำลอ���อมูล�ารา��อ��ั��ึ���วย�ำ"
-
 #: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "�ำลั��หล��ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
 msgid "Memo List Selector"
 msgstr "��รื�อ�มือ�ลือ�ราย�าร�ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-msgid "Default Memo Client"
-msgstr "��ร��รมอ�า�-��ีย��ั��ึ���วย�ำ�ริยาย"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-msgid "Default client for memo operations"
-msgstr "��ร��รม�ริยายสำหรั��าร�ระ�ำ��า�� �ั��ั��ึ���วย�ำ"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr "วิ������ี��ะ�ส���ลุ�ม��า�� �อ�ราย�าร�ั��ึ���วย�ำ"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 #, c-format
 msgid "Opening memos at %s"
 msgstr "�ำลั���ิ��ั��ึ���วย�ำ�ี� %s"
@@ -15163,63 +14931,63 @@ msgstr "�ำลั���ิ��ั��ึ���วย�ำ�ี�
 msgid "Print Memos"
 msgstr "�ิม���ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Delete Memo"
 msgstr "_ล��ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Find in Memo..."
 msgstr "_หา���ั��ึ���วย�ำ..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Search for text in the displayed memo"
 msgstr "���หา��อ�วาม���ั��ึ���วย�ำ�ี��ส��อยู�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "D_elete Memo List"
 msgstr "_ล�ราย�าร�ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Delete the selected memo list"
 msgstr "ล�ราย�าร�ั��ึ���วย�ำ�ี��ลือ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "ราย�าร�ั��ึ���วย�ำ�ห_ม�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "�รั���อมูลราย�าร�ั��ึ���วย�ำ�ี��ลือ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "��ลี�ย��ื�อราย�าร�ั��ึ���วย�ำ�ี��ลือ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "�ส�����าะ_ราย�าร�ั��ึ���วย�ำ�ี�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:705
 msgid "Memo _Preview"
 msgstr "�ส��_�ัวอย�า��ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:707
 msgid "Show memo preview pane"
 msgstr "�ส����อ��ส���ัวอย�า��ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview below the memo list"
 msgstr "�ส���ัวอย�า��ั��ึ���วย�ำ���ราย�าร�ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview alongside the memo list"
 msgstr "�ส���ัวอย�า��ั��ึ���วย�ำ��า�ราย�าร�ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
 msgid "Print the list of memos"
 msgstr "�ิม��ราย�าร�ั��ึ���วย�ำ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Preview the list of memos to be printed"
 msgstr "�ส���ัวอย�า�ราย�าร�ั��ึ���วย�ำ��อ��ิม��"
 
@@ -15264,57 +15032,20 @@ msgid "Tas_k List"
 msgstr "ราย�ารภาร�ิ_�"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "สร�า�ราย�ารภาร�ิ�ราย�าร�หม�"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "�ะ��ีย�ราย�ารภาร�ิ�"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "����ำลอ���อมูล�ารา�ภาร�ิ�"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ำ�ห����ละ��ร�สร�า��อ���ล��อร�ภาร�ิ��อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
-"\n"
-"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "�ม�สามาร�ย�าย��อมูลภาร�ิ� `%s'"
-
 #: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "�ำลั��หล�ภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:571
+#: ../modules/calendar/e-task-shell-sidebar.c:587
 msgid "Task List Selector"
 msgstr "��รื�อ�มือ�ลือ�ราย�ารภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-msgid "Default Task Client"
-msgstr "��ร��รม�ั��ารภาร�ิ��ริยาย"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-msgid "Default client for task operations"
-msgstr "��ร��รม�ริยายสำหรั��าร�ระ�ำ��า�� �ั�ภาร�ิ�"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr "วิ������ี��ส���ลุ�ม��า�� �อ�ราย�ารภาร�ิ�"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�ำลั���ิ�ภาร�ิ��ี� %s"
@@ -15324,7 +15055,7 @@ msgstr "�ำลั���ิ�ภาร�ิ��ี� %s"
 msgid "Print Tasks"
 msgstr "�ิม��ภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15336,95 +15067,95 @@ msgstr ""
 "\n"
 "�ุ���อ��ารล�ภาร�ิ��ั��หม��ี��ริ�� หรือ�ม�?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "_ล�ภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_หา��ภาร�ิ�..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "���หา��อ�วาม��ภาร�ิ��ี��ส��อยู�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "�ั�ลอ�..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "ล_�ราย�ารภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "ล�ราย�ารภาร�ิ��ี��ลือ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "ราย�ารภาร�ิ��_หม�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "�รั���อมูลราย�ารภาร�ิ��ี��ลือ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "��ลี�ย��ื�อราย�ารภาร�ิ��ี��ลือ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "�ส�����าะราย�าร_ภาร�ิ��ี�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "_�ำ��รื�อ�หมายว�ายั��ม��สร��"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "ล�ภาร�ิ��ี��สร���ล�ว"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "_�ัวอย�า�ภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "�ส����อ��ส���ัวอย�า�ภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "�ส���ัวอย�า�ภาร�ิ����ราย�ารภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "�ส���ัวอย�า�ภาร�ิ���า�ราย�ารภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "ภาร�ิ��ี��ำลั��ำอยู�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "ภาร�ิ��ี��สร���ล�ว "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "ภาร�ิ��อ� 7 วั���า�ห��า"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "ภาร�ิ��ี��ลย�ำห��"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "ภาร�ิ��ี�มี���ม���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "�ิม��ราย�ารภาร�ิ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "�ส���ัวอย�า�ราย�ารภาร�ิ���อ��ิม��"
 
@@ -15448,401 +15179,368 @@ msgid "Delete Task"
 msgstr "ล�ภาร�ิ�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "��อ�วาม��� %d ��อ�วาม"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "��อ�วาม�_มล"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgid "Compose a new mail message"
 msgstr "��ีย��มล��ั��หม�"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "�_�ล��อร��มล"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgid "Create a new mail folder"
 msgstr "สร�า���ล��อร��มล�หม�"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
 msgid "Mail Accounts"
 msgstr "�ั��ี�มล"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
 msgid "Mail Preferences"
 msgstr "�รั�����ระ���มล"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
 msgid "Composer Preferences"
 msgstr "�รั������าร��ีย���อ�วาม"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
 msgid "Network Preferences"
 msgstr "�รั�������รือ��าย"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "�ั��ลุ�ม�าม�ระ�ู�"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "�ำห��ว�า�ะ�ั��ลุ�ม��อ�วาม�าม�ระ�ู�หรือ�ม�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
+#: ../modules/mail/e-mail-shell-view-actions.c:820
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "�ิ_�����ั��ี"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "�ิ�����ั��ี�ี�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ล���อ�วาม�ี�สั��ล��ว�ออ��า��ุ���ล��อร�อย�า��าวร"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "_สร�า���ล��อร����หา�า��าร���หา..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "_�าว���หล���อ�วามสำหรั�����า����ออ��ล��"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "�าว���หล���อ�วาม�อ��ั��ี�ละ��ล��อร��ี��ำ��รื�อ�หมายออ��ล���ว�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "_�ั�ส����หมายออ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "_�ั�ลอ���ล��อร���ยั�..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Copy the selected folder into another folder"
 msgstr "�ั�ลอ���ล��อร��ี��ลือ���ยั���ล��อร�อื��"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "ล���ล��อร��ี�อย�า��าวร"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "�_����วา�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "�วา���อ�วาม�ั��หม��ี�สั��ล��ว�����ล��อร��ี��ิ��อย�า��าวร"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "�ำ�_�รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Mark all messages in the folder as read"
 msgstr "�ำ��รื�อ�หมาย�ุ���อ�วาม����ล��อร��ี�ว�าอ�า��ล�ว"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "_ย�าย��ล��อร���ยั�..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 msgid "Move the selected folder into another folder"
 msgstr "ย�าย��ล��อร��ี��ลือ���ยั���ล��อร�อื��"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "�_หม�..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Create a new folder for storing mail"
 msgstr "สร�า���ล��อร��หม�สำหรั��าร�����มล"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "��ลี�ย��ุ�สม�ั�ิ�อ���ล��อร��ี�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "�รั��ส����ล��อร��หม�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "��ลี�ย��ื�อ�อ���ล��อร��ี�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "�ลือ�_�ระ�ู���อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Select all messages in the same thread as the selected message"
 msgstr "�ลือ���อ�วาม�ั��หม��ี�อยู����ระ�ู���ียว�ั���อ�วาม�ี��ลือ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "�ลือ��ระ�ู�_ย�อย�อ���อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Select all replies to the currently selected message"
 msgstr "�ลือ���อ�วาม�ั��หม��ี��อ���อ�วาม�ี��ลือ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "�_ลิ��อ�รั�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "�ลิ��อ�รั���อมูล�า���ล��อร��ี��ลือ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "��_�ั��ยะ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ล���อ�วาม�ี�สั��ล��ว�ออ��า��ุ��ั��ีอย�า��าวร"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "��าย�_หม�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "�_ม�มี"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "��อ���อ�วาม�ี�_อ�า��ล�ว"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "��อ���อ�วาม�ั��หม��ี����อ�า��ล�ว�ว��ั�ว�ราว"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "��อ���อ�วาม�ี��_ลือ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "��อ���อ�วาม�ี��ลือ��ั�ว�ราว"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "�ส_����อ�วาม�ี���อ��ว�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "�ส����อ�วาม�ี������อ��ว��ั�ว�ราว"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "ย��ลิ���ิ�ั�ิ�าร�มล�ั��ุ�ั�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "ยุ�_�ระ�ู��ั��หม�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "ยุ��ระ�ู���อ�วาม�ั��หม�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "_�ยาย�ระ�ู��ั��หม�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "�ยาย�ระ�ู���อ�วาม�ั��หม�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "�ัว_�รอ���อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Create or edit rules for filtering new mail"
 msgstr "สร�า�หรือ�������สำหรั��าร�รอ��มล�หม�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "�_�ล��อร����หา"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "สร�า�หรือ�������อ�ำห��สำหรั���ล��อร����หา"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "�าร_�อ�รั���อมูล..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "�อ�รั�หรือ�ลิ��อ�รั���อมูล�า���ิร���วอร�ภาย�อ��ห��ั���ล��อร�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "�_�ล��อร�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "�ิ�_��าย"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "�_�ล��อร��หม�..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "_��อ���อ�วาม�ี�ล�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "��อ���อ�วาม�ี�ล� ����าร�ส����วย�าร�ี���า"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "�ส��_�ัวอย�า���อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "�ส����อ��ส���ัวอย�า���อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Show _Deleted Messages"
+msgstr "�ส����อ�วาม�ี�_ล����ล�ว"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+msgid "Show deleted messages with a line through them"
+msgstr "�ส����อ�วาม�ี���ล��ล�ว��วย ��ย�ส������ี���า"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "�ั��ลุ�ม�าม_�ระ�ู�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "�รีย���อ�วาม�����ระ�ู�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "�ส���ัวอย�า���อ�วาม���ราย�าร��อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "�ส���ัวอย�า���อ�วาม��า�ราย�าร��อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "�ุ���อ�วาม"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "��อ�วามสำ�ั�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "��อ�วามภาย�� 5 วั���อ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "��อ�วาม�ี��ม�����มล�ยะ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "��อ�วาม�ี�มี���ม���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "�ม�มี��าย"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "��อ�วาม�ี�อ�า��ล�ว"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "��อ�วามล�าสุ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "��อ�วาม�ี�ยั��ม����อ�า�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "�ื�อ�รื�อ�หรือ�ี�อยู���า�� มี�ำว�า"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "�ุ��ั��ี"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "�ั��ี�ั��ุ�ั�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "��ล��อร��ั��ุ�ั�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:892
+#: ../modules/mail/e-mail-shell-view-private.c:884
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "�ลือ�อยู� %d ราย�าร, "
 msgstr[1] "�ลือ�อยู� %d ราย�าร, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:903
+#: ../modules/mail/e-mail-shell-view-private.c:895
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "ล���อ�วาม�� %d ��ั�"
 msgstr[1] "ล���อ�วาม�� %d ��ั�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:909
-#: ../modules/mail/e-mail-shell-view-private.c:916
+#: ../modules/mail/e-mail-shell-view-private.c:901
+#: ../modules/mail/e-mail-shell-view-private.c:908
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "�มล�ยะ %d ��ั�"
 msgstr[1] "�มล�ยะ %d ��ั�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:922
+#: ../modules/mail/e-mail-shell-view-private.c:914
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "��หมายร�า� %d ��ั�"
 msgstr[1] "��หมายร�า� %d ��ั�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:928
+#: ../modules/mail/e-mail-shell-view-private.c:920
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "ยั��ม�ส�� %d ��ั�"
 msgstr[1] "ยั��ม�ส�� %d ��ั�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:934
+#: ../modules/mail/e-mail-shell-view-private.c:926
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "ส���ล�ว %d ��ั�"
 msgstr[1] "ส���ล�ว %d ��ั�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:946
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "ยั��ม�อ�า� %d, "
 msgstr[1] "ยั��ม�อ�า� %d, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:949
+#: ../modules/mail/e-mail-shell-view-private.c:941
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15861,79 +15559,101 @@ msgstr "�าร���หา�ั��ี"
 msgid "Proxy _Logout"
 msgstr "_ออ��า��าร���าระ�����า�ะ�ัว���"
 
+#: ../modules/mail/em-account-prefs.c:129
+msgid "Evolution Account Assistant"
+msgstr "��รื�อ�มือ��วย�ั����า�ั��ี Evolution"
+
+#: ../modules/mail/em-account-prefs.c:178
+msgid "Account Editor"
+msgstr "ห��า��า�������ั��ี"
+
 #: ../modules/mail/em-composer-prefs.c:473
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "��ิ�����า�"
+
+#: ../modules/mail/em-composer-prefs.c:477
 msgid "Language(s)"
 msgstr "ภาษา"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "�ุ��วลา"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "ห�ึ���รั����อวั�"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "ห�ึ���รั����อสั��าห�"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "ห�ึ���รั����อ��ือ�"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "��ิ�ม��อมูลส�ว�หัว�ำห���อ��อ��ยะ"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "�ื�อ��อมูลส�ว�หัว:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "��อมูลส�ว�หัวมี�ำว�า:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "หัว�ระ�าษ"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "มี�ำว�า"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "มี�ลั��อิ� %s �ละ����ิ��ั�����ารี�ว��ล�ว"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "�ม�มี�ลั��อิ� %s �รุ�า�รว�สอ�ว�า����ิ��ั��������หรือ�ม�"
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "�ม�มี�ลั��อิ��รว��ยะ"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "_�อลัม���ารา�:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1162
 msgid "_Date header:"
 msgstr "��อมูลส�ว�หัว��อ�_วั��ี�:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1163
 msgid "Show _original header value"
 msgstr "�ส����อมูลส�ว�หัว�าม_�����ั�"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "�รว�สอ�ว�า Evolution ������ร��รมอ�า�-��ีย��มล�ริยายหรือ�ม�"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"�ุ��รั���ี� Evolution �ริ�ม�ำ�า� �รว�สอ�ว�า Evolution ������ร��รมอ�า�-��ีย��มล�ริยายหรือ�ม�"
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+msgid "Do you want to make Evolution your default email client?"
+msgstr "�ุ���อ��าร�ำห���ห� Evolution ������ร��มลู���ายอี�มล�ริยาย�อ��ุ�หรือ�ม�?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "สวัส�ี���อ�"
@@ -15950,6 +15670,50 @@ msgstr "�ลั��อิ����อ���สอ�"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "�ลั��อิ���สอ�สำหรั��ัว�หล� EPlugin ���อ�"
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:389
+msgid "Please select the information that you would like to import:"
+msgstr "�รุ�า�ลือ���อมูล�ี��ุ���อ��าร�ำ���า:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:545
+#, c-format
+msgid "From %s:"
+msgstr "�า� %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+msgid "Importing Files"
+msgstr "�าร�ำ���า���ม"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "ย��ลิ��าร�ำ���า�ล�ว ���ุ�ม \"�ั���\" ��ื�อ�ำ��ิ��าร��อ"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "�ำ���า�สร��สม�ูร���ล�ว ���ุ�ม \"�ั���\" ��ื�อ�ำ��ิ��าร��อ"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "��รื�อ�มือ��วย�ั����า Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "ยิ��ี��อ�รั�"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"ยิ��ี��อ�รั�สู� Evolution  ห��า�อ�ั����ี� �ะ�ั����า Evolution �ห���ื�อม��อ�ั��ั��ีอี�มล�อ��ุ� "
+"�ละ�ำ���า���ม��อมูล�า���ร��รมอื��\n"
+"\n"
+"�รุ�า���ุ�ม \"�ั���\" ��ื�อ�ำ�า���อ"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "��ิ�มสมุ��ี�อยู�����รื�อ����า�� Evolution"
@@ -15964,14 +15728,8 @@ msgid ""
 "body"
 msgstr "ราย�าร��าะ�ส�ี��ลั��อิ���ือ��าร������ม�ะ���หา����ื�อ�วาม"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "ราย�าร��าะ�ส�ี��ลั��อิ���ือ��าร������ม�ะ���หา����ื�อ�วาม"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "�ำหลั�"
 
@@ -16009,23 +15767,23 @@ msgstr "�สีย�����อ�วาม"
 msgid "Play audio attachments directly in mail messages."
 msgstr "�ล���สีย��ี����มา����อ�วาม�มล��ย�ร�"
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "�ลือ��ื�อ�อ����มสำรอ���อมูล�อ� Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "�_ริ�ม Evolution �หม�หลั��ารสำรอ�"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "�ลือ����มสำรอ���อมูล�อ� Evolution �ี��ะ�รีย��ื�"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "�_ริ�ม Evolution �หม�หลั��าร�รีย��ื�"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16034,35 +15792,35 @@ msgstr ""
 "�ุ�สามาร��ื�� Evolution �ื���ย������มสำรอ���อมูล�อ��ุ� ��ย�ะ�ื���ั����อมูล �มล, ��ิ�ิ�, "
 "ภาร�ิ�, �ั��ึ���วย�ำ, สมุ��ี�อยู� �ละยั��ื����า�ั��ส�ว��ัว �ัว�รอ��มล ฯลฯ ��า�� �อ��ุ���วย"
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_�ื�� Evolution �า����มสำรอ���อมูล"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "�รุ�า�ลือ����ม�ั�������อมูล���า�อ� Evolution �ี��ะ�ื���ื�:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "�ลือ����ม�ี��ะ�ื��"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "�ื���ื���ย�����อมูลสำรอ�"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_สำรอ���า�ั��..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_สำรอ���า�ั���อ� Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "สำรอ���อมูล�ละ��า�ั���อ� Evolution ล������ม�ั�����"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "_�ื����า�ั��..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "_�ื����า�ั���อ� Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "�ื����อมูล�ละ��า�ั���อ� Evolution �า����ม�ั�����"
 
@@ -16110,7 +15868,7 @@ msgid "Restarting Evolution"
 msgstr "�ำลั��ริ�ม��ิ� Evolution �หม�"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "สำรอ���อมูล�ั��ุ�ั��อ� Evolution"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16140,31 +15898,31 @@ msgid "Restoring from the folder %s"
 msgstr "�ำลั��ื����ย�����ล��อร� %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "สำรอ���อมูล Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "�ื����อมูล Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "�ำลั�สำรอ���อมูล�อ� Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "��ร�รอสั��รู� Evolution �ำลั�สำรอ���อมูล�อ��ุ�"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "�ำลั��ื����อมูล Evolution �ื�"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "��ร�รอสั��รู� Evolution �ำลั��ื����อมูล�อ��ุ��ื�"
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "อา�����วลา�า� �ึ��อยู��ั��ริมา���อมูล���ั��ี�อ��ุ�"
 
@@ -16227,35 +15985,35 @@ msgstr ""
 "�รุ�า�รว�สอ��ห������ว�า�ุ�����ิ�ห��า��า��ี�ยั��ม��ั��ึ��ร�หม��ล�ว��อ��ี��ะ�ำ��ิ��าร��อ�� "
 "��า�ุ���อ��าร�ห��ริ�ม��ิ� Evolution �หม���ยอั���มั�ิหลั��าร�ื����อมูล �รุ�า�า�ี��ล�อ��า"
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�ิ���ออั���มั�ิ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "��ิ�มราย�าร��สมุ�_�ี�อยู��มื�อ�อ��มล"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "�ลือ�สมุ��ี�อยู�สำหรั��ี�อยู��ิ���ออั���มั�ิ"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "�ู��ิ���อสำหรั���อ�วาม�ั���"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "�รั���อมูล�ู��ิ���อ�ละรู�ภา��ั�ราย�ื�อ�ู�ส���า�อ� Pidgin"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_�รั���อมูล�ู��ิ���อ�ละรู�ภา��ั�ราย�ื�อ�ู�ส���า�อ� Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "�ลือ�สมุ��ี�อยู�สำหรั��ู�ส���า�อ� Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "�รั���อมูล�ั�ราย�ื�อ_�ู�ส���า��ี�ยว�ี�"
 
@@ -16274,33 +16032,33 @@ msgstr ""
 "��ิม�ื�อ�ละ�ี�อยู�อี�มลล���สมุ��ี�อยู���ยอั���มั�ิ��ะ�ี��ุ��อ��มล "
 "รวม�ั����ิม��อมูล�ู��ิ���อ��อ�วาม�ั����า�ราย�ื�อ�ู�ส���า�อ��ุ���วย"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "�ม�มี Bogofilter ��ระ�� �รุ�า�ิ��ั���สีย��อ�"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "��ิ���อ�ิ��ลา���ะสร�า���ร��ส %s: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "��ร��สลู� Bogofilter �ม��อ�ส�อ� �ะ��า�ิ��..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "�าร�อย��ร��สลู� Bogofilter �ู��ั��ั�หวะ �ะ����ร��รม..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "สร�า�������ยั� Bogofilter �ม�สำ�ร�� รหัส��อ�ิ��ลา�: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:396
 msgid "Convert message text to _Unicode"
 msgstr "��ล�อั��ระ����อ�วาม����_ยู�ิ����"
 
@@ -16328,15 +16086,15 @@ msgstr "�ัว�ลือ�สำหรั� Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "�รอ��มล�ยะ��ย��� Bogofilter"
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "ยื�ยั��ัว�ุ��ล�ม�สำ�ร�� ��ิร���วอร���อ��าร�าร���าระ��อย�า��ู���อ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "หา URL �ี��ำห���ม���"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16345,36 +16103,36 @@ msgstr ""
 "��ิร���วอร��ื���อมูล�ี��ม��า�หมาย\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "�ม�สามาร�����ำ�อ��า���ิร���วอร�"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "�ห�ุ�าร��"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "��ิ�ิ��อ��ู����"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "อ�า� URL �อ���ิร���วอร��ม�สำ�ร��"
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "�ำลั����หา��ิ�ิ��อ��ู����..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "�ม�����ิ�ิ����ลย�อ��ู����"
 
@@ -16388,67 +16146,63 @@ msgstr "�วาม�ยายามล�าสุ�ล�ม�หลว: %
 msgid "Previous attempt failed with code %d"
 msgstr "�วาม�ยายามล�าสุ�ล�ม�หลว��วยรหัส %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "��อ�รหัส��า�สำหรั��ู���� <b>%s</b> �ี���ิร���วอร� <b>%s</b>"
+msgid "Enter password for user %s on server %s"
+msgstr "��อ�รหัส��า�สำหรั��ู���� %s �ี���ิร���วอร� %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "�ม�สามาร�สร�า���อ�วาม soup สำหรั� URL '%s'"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "�ำลั������ื�อหา��ล��อร�..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "ราย�ื�อ��ิ�ิ��ี�มี:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "รอ�รั�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "�ม�สามาร�สร�า���ร�: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "URL '%s' �อ���ิร���วอร� �ม���� URL �ี��ู���อ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "�รีย��ู��ื�อหา��ิ�ิ� CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "��� _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "�_รีย��ู��ิร���วอร���ื�อหา��ิ�ิ�"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "�_หล��หม�:"
 
@@ -16460,31 +16214,31 @@ msgstr "��ิ�ม�ารรอ�รั� CalDAV �ห��ั� Evo
 msgid "CalDAV Support"
 msgstr "�ารรอ�รั� CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_�รั��ัว�ลือ�"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "_�ื�อ���ม:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "�ลือ����ม��ิ�ิ�"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "��ะ��ิ�"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "�มื�อ���ม��ลี�ย���ล�"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "����ระยะ"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "�ั��ั���ิ����_อ�า�อย�า���ียว"
 
@@ -16496,11 +16250,11 @@ msgstr "��ิ�ม��ิ�ิ�����รื�อ����า
 msgid "Local Calendars"
 msgstr "��ิ�ิ�����รื�อ�"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "�_���าร��ื�อม��อ����ิรภัย"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "_�ื�อ�ู����:"
 
@@ -16548,26 +16302,26 @@ msgstr "สภา�อา�าศ: �ื���อ���า���ม
 msgid "Weather: Thunderstorms"
 msgstr "สภา�อา�าศ: �ายุ��า�ะ�อ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "�ลือ�ส�า��ี�"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_ห��วย:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "�ม�ริ� (��ล��ียส, �.ม. ฯลฯ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "อั��ฤษ (�า�ร��ฮ��, �ิ�ว ฯลฯ)"
 
@@ -16596,45 +16350,23 @@ msgstr "��ิ�ม����ี��ส���ำ�ห����ี
 msgid "Map for contacts"
 msgstr "����ี��ู��ิ���อ"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "�รว�สอ�ว�า Evolution ������ร��รมอ�า�-��ีย��มล�ริยายหรือ�ม�"
-
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"�ุ��รั���ี� Evolution �ริ�ม�ำ�า� �รว�สอ�ว�า Evolution ������ร��รมอ�า�-��ีย��มล�ริยายหรือ�ม�"
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "�รว�สอ���ะ�ริ�ม��ร��รม ว�า Evolution ������ร��รมอ�า�-��ีย��มล�ริยายหรือ�ม�"
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "��ร��รมอ�า�-��ีย��มล�ริยาย"
-
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "�ุ���อ��าร�ำห���ห� Evolution ������ร��มอ�า�-��ีย��มล�ริยาย�อ��ุ�หรือ�ม�?"
-
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "�ำ��รื�อ�หมาย����สมุ��ี�อยู�_�ริยาย"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "�_�ิม���มอั���มั�ิ��วยสมุ��ี�อยู��ี�"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "�ำ��รื�อ�หมาย������ิ�ิ�_�ริยาย"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "�ำ��รื�อ�หมาย����ราย�ารภาร�ิ�_�ริยาย"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "�ำ��รื�อ�หมาย����ราย�าร�ั��ึ���วย�ำ_�ริยาย"
 
@@ -16688,12 +16420,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "��อมูลส�ว�หัว_�ำห���อ�"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16701,12 +16433,12 @@ msgstr ""
 "รู�����าร�ำห����า��อมูลส�ว�หัว�ือ:\n"
 "�ื�อ�อ���า��อมูลส�ว�หัว �ั����วย \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "�ีย�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "��า"
 
@@ -16728,7 +16460,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "��ิ���รื�อ�มือ�������ยอั���มั�ิ�มื�อมี�าร���ุ�ม�����ิม����ห��า��า���ีย��มล"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "��ิ���รื�อ�มือ�������ยอั���มั�ิ�มื�อมี�าร������มล�หม�"
 
@@ -16740,11 +16472,11 @@ msgstr "��รื�อ�มือ�������อ�วามภา
 msgid "The default command that must be used as the editor."
 msgstr "�ำสั���ริยาย�ี��ะ���������รื�อ�มือ�������อ�วาม"
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "�ำสั���ี��ะ�ำ�า���ื�อ�รีย���รื�อ�มือ�����:"
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16752,8 +16484,8 @@ msgstr ""
 "สำหรั� Emacs ��� \"xemacs\"\n"
 "สำหรั� VI ��� \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "��ีย���อ�วาม��วย��รื�อ�มือ�����ภาย�อ�"
 
@@ -16827,7 +16559,7 @@ msgstr "�_�ร�รู���าย��ย�ริยาย"
 msgid "Load new _Face picture"
 msgstr "�หล�รู�_��ายรู��หม�"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "��ิมรู�_��าย"
 
@@ -16859,22 +16591,17 @@ msgstr "�ม�สามาร�อ�า����ม���"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "���ม�ี��ุ��ลือ��ู�ะ�ม����รู�ภา� .png �ี��ู���อ� ��อ�ิ��ลา�: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "�ู��ิล"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "��ิร���วอร�"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>��ิร���วอร�</b>"
-
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "��อ�รหัส��า�สำหรั��ู���� %s ��ื�อ���า�ึ�ราย�าร��ิ�ิ��ี��อ�รั��ว�"
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16883,18 +16610,18 @@ msgstr ""
 "�ม�สามาร�อ�า���อมูล�า���ิิร���วอร��อ��ู��ิล\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "_��ิ�ิ�:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "�ึ�_ราย�าร"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -16905,7 +16632,7 @@ msgstr "��ิ�ม��ิ�ิ��ู��ิล���า�� Ev
 msgid "Google Calendars"
 msgstr "��ิ�ิ��ู��ิล"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "ราย�าร�รว�สอ�"
 
@@ -16937,12 +16664,12 @@ msgstr "อา��อ�รั�"
 msgid "Rese_nd Meeting..."
 msgstr "ส�_��าร�ระ�ุม��ำ..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:349
 msgid "Create folder"
 msgstr "สร�า���ล��อร�"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16967,19 +16694,19 @@ msgstr ""
 "�ลิ� '�ริ�ม���' ��ื�อ�ิ��ั����ล��อร��ี����ร�วม\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "�ิ��ั����ล��อร����ร�วม"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "�าร�ิ��ั����ล��อร����ร�วม"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "�ั����า�มล�ยะ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "�ั����า�มล�ยะ"
@@ -16992,11 +16719,6 @@ msgstr "อี�มล:"
 msgid "Junk List:"
 msgstr "ราย�าร�มล�ยะ:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_�ิ�����า�"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_��ิ�����า�"
@@ -17015,14 +16737,14 @@ msgstr "_ล�"
 msgid "Message Retract"
 msgstr "�อ���อ�วาม�ลั�"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
 "�าร�อ���อ�วาม�ลั�อา������ารล���อ�วาม�า��ล�อ��มล�อ��ู�รั� �ุ������หรือ�ม�ว�า�ะ�ำ�����ั��?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "�อ���อ�วาม�ลั�สำ�ร���ล�ว"
 
@@ -17141,25 +16863,25 @@ msgid "Would you like to decline it?"
 msgstr "�ุ��ะ��ิ�ส�หรือ�ม�?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>�ู����:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_�ำห����อ�วาม�����ห�ุ"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "�ี�อยู�_�ิ���อ..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "�าร�����ห�ุ��ล��อร����ร�วม"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "�ู����าร�วม�ะ���รั��าร�����ห�ุ�ั��ี�\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "�ู����:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "�_ม��ห����ร�วม"
@@ -17198,11 +16920,11 @@ msgstr "�ั��ึ���วย�ำ"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
-msgstr "�อ�รั���อมูล�า��ระ�าศ�����_�ือ��อ���า����า"
+msgstr "�อ�รั���อมูล�า��ระ�าศ�����_�ือ��อ��ั�"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
-msgstr "�อ�รั���อมูล�า��าร�����_ห�ุ�อ���า����า"
+msgstr "�อ�รั���อมูล�า��าร�����_ห�ุ�อ��ั�"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
@@ -17217,50 +16939,57 @@ msgid "Proxy"
 msgstr "�ัว���"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>�ื�อ�ั��ี</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "�ื�อ�ั��ี"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ล��ั��ึ����า������า�ะ�ัว���"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s��อ�รหัส��า�สำหรั� %s (�ู���� %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "�����ัว����ะ����������อ�มื�อ�ั��ีออ��ล��อยู�"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "�����ัว����ะ����������อ�มื�อ�ั��ี��ิ����"
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "�ัว���"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "��ิ�ม�ู����"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "�ัว�ลือ��ั��สู��อ��ารส��"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:315
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "�ู����"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "�รุ�า��อ��ื�อ�ู�����ละ�ั����า�ารอ�ุ�า����สิ��ิ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:416
 msgid "Sharing"
 msgstr "�าร���ร�วม"
 
@@ -17272,63 +17001,55 @@ msgstr "�าร�����ห�ุ�ำห���อ�"
 msgid "Add   "
 msgstr "��ิ�ม   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ส�า�ะ��อ�วาม"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "�_รื�อ�:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "_�า�:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "วั��ี�สร�า�:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "�ู�รั�: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "�ึ��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "��ิ��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "�อ�รั��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "ล��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "��ิ�ส��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "�สร���มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "ส���ม��ึ��มื�อ: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "��ิ�ม�ารรอ�รั� Hula �ห��ั� Evolution"
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "�ารรอ�รั� Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "รู�ภา�����อ�วาม"
@@ -17337,12 +17058,12 @@ msgstr "รู�ภา�����อ�วาม"
 msgid "View image attachments directly in mail messages."
 msgstr "�ส��รู�ภา��ี����มาล�����อ�วาม�มล��ย�ร�"
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:332
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "��อมูลส�ว�หัว�ำห���อ�"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:345
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "��อมูลส�ว�หัว IMAP"
@@ -17388,666 +17109,662 @@ msgstr "�รั������ั��ี IMAP �อ��ุ�"
 msgid "IMAP Features"
 msgstr "�าร����า� IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:482
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "�ม�สามาร���ิ���ิ�ิ� '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:648
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "มี�ั�หมาย����ิ�ิ� '%s' ���ั��าร�ระ�ุม�ี�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:684
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "���ั�หมาย����ิ�ิ� '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find any calendars"
 msgstr "�ม�����ิ�ิ����ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this meeting in any calendar"
 msgstr "�ม����าร�ระ�ุม�ี�����ิ�ิ����ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this task in any task list"
 msgstr "�ม���ภาร�ิ��ี���ราย�ารภาร�ิ����ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this memo in any memo list"
 msgstr "�ม����ั��ึ���วย�ำ�ี���ราย�าร�ั��ึ���วย�ำ���ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:872
 msgid "Opening the calendar. Please wait.."
 msgstr "�ำลั���ิ���ิ�ิ� ��ร�รอสั��รู�.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Searching for an existing version of this appointment"
 msgstr "�ำลั����หา�ั�หมาย�ี��ี��ั��ึ��ว�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1056
 msgid "Unable to parse item"
 msgstr "�ม�สามาร����ราย�าร���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "�ม�สามาร�ส��ราย�าร��ยั���ิ�ิ� '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1155
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�า�อ�รั�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�าอา��อ�รั�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1164
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�า��ิ�ส�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1169
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�าย��ลิ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "�ู��ระสา��า����ล��ู�รั�มอ��ั��ะ %s ออ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1270
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ส���ระ�าศ�ารย��ลิ���ยั��ู�รั�มอ��ั��ะ�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "�ม�สามาร�ส���ระ�าศ�ารย��ลิ���ยั��ู�รั�มอ��ั��ะ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "�ม�สามาร��รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม��� ��ื�อ��า�ส�า�ะ������า�ี�����ม����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "�ม�สามาร��รั���อมูล�ู����าร�วม %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Attendee status updated"
 msgstr "�รั���อมูล�ู����าร�วม�รีย�ร�อย�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1442
 msgid "Meeting information sent"
 msgstr "ส����อมูล�าร�ระ�ุม�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Task information sent"
 msgstr "ส����อมูลภาร�ิ��ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Memo information sent"
 msgstr "ส����อมูล�ั��ึ���วย�ำ�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1457
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "�ม�สามาร�ส����อมูล�าร�ระ�ุม��� ��ื�อ��า��ม�มี�าร�ระ�ุม�ี�อยู�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send task information, the task does not exist"
 msgstr "�ม�สามาร�ส����อมูลภาร�ิ���� ��ื�อ��า��ม�มีภาร�ิ��ี�อยู�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "�ม�สามาร�ส����อมูล�ั��ึ���วย�ำ��� ��ื�อ��า��ม�มี�ั��ึ���วย�ำ�ี�อยู�"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1533
 msgid "Save Calendar"
 msgstr "�ั��ึ���ิ�ิ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "��ิ�ิ�����าร�ม����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "��อ�วามอ�า�ว�ามี��ิ�ิ� ����ัว��ิ�ิ��ม���� iCalendar �ี�����าร���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1772
 msgid "The item in the calendar is not valid"
 msgstr "ราย�าร����ิ�ิ��ม��ู���อ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "��อ�วามมี��ิ�ิ�มา��วย ����ัว��ิ�ิ��ม�มี��อมูล�ห�ุ�าร�� ภาร�ิ� หรือส�า�ะว�า�/�ม�ว�า���� �ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "��ิ�ิ��ี����มามีราย�ารหลายราย�าร"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "��ื�อ�ะ�ำ��ิ��า�ราย�าร�ั��หม� �วร�ั��ึ����ม�ล�ว�ำ���า��ิ�ิ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "This meeting recurs"
 msgstr "�าร�ระ�ุม�ี��วีย���ำ����รอ��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This task recurs"
 msgstr "ภาร�ิ��ี��วีย���ำ����รอ��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This memo recurs"
 msgstr "�ั��ึ���วย�ำ�ี��วีย���ำ����รอ��"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "_Delete message after acting"
 msgstr "_ล���อ�วามหลั��า��ำ�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2734
 msgid "Conflict Search"
 msgstr "�าร���หา�าร���ั�"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2716
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "�ลือ���ิ�ิ��ี��ะ���หา�าร�ระ�ุม�ี����ั�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "วั��ี� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "วั��ี� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "วั��ี� %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "�รุ���ี� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "�รุ���ี� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "�รุ���ี� %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "�รุ���ี� %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Ey"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Ey %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Ey %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Ey %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Ey %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "�รุ�า�อ��ลั����าม�อ� <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "���รั����าม�อ� <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> ���������า� %s �ระ�าศ��อมูล�าร�ระ�ุม��อ���ี�:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> ����ระ�าศ��อมูล�าร�ระ�ุม��อ���ี�:"
+msgid "Please respond on behalf of %s"
+msgstr "�รุ�า�อ��ลั����าม�อ� %s"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> ���มอ��ั��ะ�าร�ระ�ุม��อ���ี��ห��ั��ุ�:"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ������า� %s �อ�ห��ุ����าร�วม�าร�ระ�ุม��อ���ี�:"
+msgid "Received on behalf of %s"
+msgstr "���รั����าม�อ� %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> �อ�ห��ุ����าร�วม�าร�ระ�ุม��อ���ี�:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s ���������า� %s �ระ�าศ��อมูล�าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ������า� %s �อ��ิ�ม��ิม��อมูล���าร�ระ�ุม��อ���ี�:"
+msgid "%s has published the following meeting information:"
+msgstr "%s ����ระ�าศ��อมูล�าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> �อ��ิ�ม��ิม��อมูล���าร�ระ�ุม��อ���ี�:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s ���มอ��ั��ะ�าร�ระ�ุม��อ���ี��ห��ั��ุ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr "<b>%s</b> ������า� %s �อ��อมูลล�าสุ��อ��าร�ระ�ุม��อ���ี�:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s ������า� %s �อ�ห��ุ����าร�วม�าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ��อ��าร��อมูลล�าสุ��อ��าร�ระ�ุม��อ���ี�:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s �อ�ห��ุ����าร�วม�าร�ระ�ุม��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> ��ย��า� %s ���ส���ำ�อ�สำหรั��าร�ระ�ุม�ลั�มา�ั��ี�:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s ������า� %s �อ��ิ�ม��ิม��อมูล���าร�ระ�ุม��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> ���ส���ำ�อ�สำหรั��าร�ระ�ุม�ลั�มา�ั��ี�:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s �อ��ิ�ม��ิม��อมูล���าร�ระ�ุม��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ������า� %s �อย��ลิ��าร�ระ�ุม��อ���ี�:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s ������า� %s �อรั���อมูลล�าสุ��อ��าร�ระ�ุม��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> ���ย��ลิ��าร�ระ�ุม��อ���ี�:"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s ��อ��ารรั���อมูลล�าสุ��อ��าร�ระ�ุม��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> ������า� %s �ส�อ�อ��ลี�ย���ล��าร�ระ�ุม�ั��ี�"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s ��ย��า� %s ���ส���ำ�อ�สำหรั��าร�ระ�ุม�ลั�มา�ั��ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> ����ส�อ�อ��ลี�ย���ล��าร�ระ�ุม�ั��ี�:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s ���ส���ำ�อ�สำหรั��าร�ระ�ุม�ลั�มา�ั��ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ����ส�อ��า� %s �อ��ิ�ส��าร��ลี�ย���ล��าร�ระ�ุม��อ���ี�:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s ���������า� %s �อย��ลิ��าร�ระ�ุม��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> �����ิ�ส��าร��ลี�ย���ล��าร�ระ�ุม��อ���ี�:"
+msgid "%s has canceled the following meeting."
+msgstr "%s ���ย��ลิ��าร�ระ�ุม��อ���ี�"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> ���������า� %s �ระ�าศภาร�ิ���อ���ี�:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s ������า� %s �ส�อ�อ��ลี�ย���ล��าร�ระ�ุม�ั��ี�"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> ����ระ�าศภาร�ิ���อ���ี�:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s ����ส�อ�อ��ลี�ย���ล��าร�ระ�ุม�ั��ี�"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> �อมอ�หมาย %s �ห��ำภาร�ิ���อ���ี�:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s ����ส�อ��า� %s �อ��ิ�ส��าร��ลี�ย���ล��าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> ���������า� %s �อมอ�หมายภาร�ิ��ห��ั��ุ�:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s �����ิ�ส��าร��ลี�ย���ล��าร�ระ�ุม��อ���ี�"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> ���มอ�หมายภาร�ิ��ห��ั��ุ�:"
+msgid "%s through %s has published the following task:"
+msgstr "%s ���������า� %s �ระ�าศภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ������า� %s �อ��ิ�ม��ิม��อมูล��ภาร�ิ���อ���ี�:"
+msgid "%s has published the following task:"
+msgstr "%s ����ระ�าศภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> �อ��ิ�ม��ิม��อมูล��ภาร�ิ���อ���ี�:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s �อมอ�หมาย %s �ห��ำภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr "<b>%s</b> ������า� %s �อ��อมูลล�าสุ��อ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s ���������า� %s �อมอ�หมายภาร�ิ��ห��ั��ุ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "<b>%s</b> ��อ��าร��อมูลล�าสุ��อ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+msgid "%s has assigned you a task:"
+msgstr "%s ���มอ�หมายภาร�ิ��ห��ั��ุ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ��ย��า� %s ���ส���ำ�อ�สำหรั�ภาร�ิ��ี�มี�ารมอ�หมาย�ลั�มา�ั��ี�:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s ������า� %s �อ��ิ�ม��ิม��อมูล��ภาร�ิ���อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> ���ส���ำ�อ�สำหรั�ภาร�ิ��ี�มี�ารมอ�หมาย�ลั�มา�ั��ี�:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s �อ��ิ�ม��ิม��อมูล��ภาร�ิ���อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ���������า� %s �อย��ลิ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "%s ������า� %s �อรั���อมูลล�าสุ��อ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> ���ย��ลิ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s ��อ��ารรั���อมูลล�าสุ��อ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ������า� %s �ส�อ��ลี�ย���ล��ารมอ�หมายภาร�ิ��ั��ี�:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s ��ย��า� %s ���ส���ำ�อ�สำหรั�ภาร�ิ��ี�มี�ารมอ�หมาย�ลั�มา�ั��ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ����ส�อ��ลี�ย���ล��ารมอ�หมายภาร�ิ��ั��ี�:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s ���ส���ำ�อ�สำหรั�ภาร�ิ��ี�มี�ารมอ�หมาย�ลั�มา�ั��ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ����ส�อ��า� %s �อ��ิ�ส�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s ���������า� %s �อย��ลิ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> �����ิ�ส�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s ���ย��ลิ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> ���������า� %s �ระ�าศ�ั��ึ���วย�ำ��อ���ี�:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s ������า� %s �ส�อ��ลี�ย���ล��ารมอ�หมายภาร�ิ��ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> ����ระ�าศ�ั��ึ���วย�ำ��อ���ี�:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s ����ส�อ��ลี�ย���ล��ารมอ�หมายภาร�ิ��ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s ����ส�อ��า� %s �อ��ิ�ส�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s �����ิ�ส�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s ���������า� %s �ระ�าศ�ั��ึ���วย�ำ��อ���ี�:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ������า� %s �อ��ิ�ม��ิม��อมูล���ั��ึ���วย�ำ��อ���ี�:"
+msgid "%s has published the following memo:"
+msgstr "%s ����ระ�าศ�ั��ึ���วย�ำ��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> �อ��ิ�ม��ิม��อมูล���ั��ึ���วย�ำ��อ���ี�:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s ������า� %s �อ��ิ�ม��ิม��อมูล���ั��ึ���วย�ำ��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ������า� %s �อย��ลิ��ั��ึ���วย�ำ���ร�วม��อ���ี�:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s �อ��ิ�ม��ิม��อมูล���ั��ึ���วย�ำ��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> ���ย��ลิ��ั��ึ���วย�ำ��อ���ี�:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s ���������า� %s �อย��ลิ��ั��ึ���วย�ำร�วม�ั���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s ���ย��ลิ��ั��ึ���วย�ำร�วม�ั���อ���ี�:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "�ั��วั�:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "วั��ริ�ม���:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "�วลา�ริ�ม:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "วั�สิ��สุ�:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "�วลาสิ��สุ�:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_��ิ���ิ�ิ�"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_��ิ�ส�"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
 msgstr "�อ�_รั�"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "_��ิ�ส��ั��หม�"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
-msgstr "�อ�รั��_ม�ยื�ยั��ั��หม�"
+msgstr "�อ�����_ม�ยื�ยั��ั��หม�"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
-msgstr "�อ�รั��_ม�ยื�ยั�"
+msgstr "�อ�����_ม�ยื�ยั�"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
 msgstr "�อ�_รั��ั��หม�"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_ส����อมูล"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "_�รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_�รั���อมูล"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "หมาย�ห�ุ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_�อ���ยั��ู�ส��"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "ส���าร_�รั���อมูล��ยั��ู�ร�วม�ระ�ุม"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "����ั�_�ุ�รอ��ี��วีย���ำ"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "�ส���วลาว�า_ว�า�"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
-msgstr "_รั�ษาราย�าร��ือ��อ���า����า�ว�"
+msgstr "_รั�ษาราย�าร��ือ��อ��ั��ว�"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_สื��อ�ราย�าร��ือ�"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_ภาร�ิ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_�ั��ึ���วย�ำ:"
 
@@ -18060,18 +17777,14 @@ msgid "Itip Formatter"
 msgstr "�ลั��อิ��ั��ส�� Itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; ���มอ��ั��ะ�าร�ระ�ุม �ุ���อ��าร��ิ�ม�ู�รั�มอ��ั��ะ &quot;{1}&quot; "
-"หรือ�ม�?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "'{0}' ���มอ��ั��ะ�าร�ระ�ุม �ุ���อ��าร��ิ�ม�ู�รั�มอ��ั��ะ '{1}' หรือ�ม�?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "�าร�ระ�ุม�ี�มี�ารมอ��ั��ะ"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "�ำ�อ��ี��ม����มา�า��ู�ร�วม�ระ�ุม�ั��ุ�ั�  �ะ��ิ�ม�ู�ส�����า�����ู�ร�วม�ระ�ุมหรือ�ม�?"
@@ -18150,16 +17863,16 @@ msgstr "�ำห��ว�า�ะ�ะ�ริ��อ�อ���ว
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�ำห��ว�า�ะ������อ�วาม�หม����าะสำหรั��ล�อ���หมาย���าหรือ�ม�"
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:346
 msgid "Evolution's Mail Notification"
 msgstr "�าร�����มล�อ� Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Mail Notification Properties"
 msgstr "�ุ�สม�ั�ิ�าร�����มล"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:499
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18175,66 +17888,66 @@ msgstr[1] ""
 "�� %s"
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:510
 #, c-format
 msgid "From: %s"
 msgstr "�า�: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:522
 #, c-format
 msgid "Subject: %s"
 msgstr "�รื�อ�: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:531
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "�ุ����รั���อ�วาม�หม� %d ��อ�วาม"
 msgstr[1] "�ุ����รั���อ�วาม�หม� %d ��อ�วาม"
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:554
 msgid "New email"
 msgstr "อี�มล�หม�"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:608
 msgid "Show icon in _notification area"
 msgstr "�ส���อ�อ����ื���ี��_����ห�ุ"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "B_link icon in notification area"
 msgstr "_�ะ�ริ��อ�อ����ื���ี������ห�ุ"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:646
 msgid "Popup _message together with the icon"
 msgstr "�ุ�_��อ�วาม�ึ���ร�อม�ั��อ�อ���วย"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:831
 msgid "_Play sound when new messages arrive"
 msgstr "ส���_สีย��มื�อมี��อ�วาม���ามา�หม�"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:860
 msgid "_Beep"
 msgstr "�สีย�_�ี��"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:873
 msgid "Use sound _theme"
 msgstr "����ุ��_สีย�"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "Play _file:"
 msgstr "�ล���สีย_�:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Select sound file"
 msgstr "�ลือ����ม�สีย�"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:961
 msgid "Notify new messages for _Inbox only"
 msgstr "������อ�วาม�หม����าะสำหรั��ล�อ���หมาย�_��า���า�ั��"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:970
 msgid "Generate a _D-Bus message"
 msgstr "ส����อ�วาม _D-Bus"
 
@@ -18247,26 +17960,26 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "�����ห��ุ��รา��มื�อมี��อ�วาม���ามา�หม�"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "สร�า��า��มล�อ� %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "��ิ�ิ��ี��ลือ�มี�ห�ุ�าร�� '%s' อยู���อ��ล�ว �ุ���อ��าร�ะ������ห�ุ�าร�����าหรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "ราย�ารภาร�ิ��ี��ลือ�มีภาร�ิ� '%s' อยู���อ��ล�ว �ุ���อ��าร�ะ�����ภาร�ิ����าหรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18274,21 +17987,30 @@ msgid ""
 msgstr ""
 "ราย�าร�ั��ึ���วย�ำ�ี��ลือ�มี�ั��ึ���วย�ำ '%s' อยู���อ��ล�ว �ุ���อ��าร�ะ������ั��ึ���วย�ำ���าหรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
 msgstr ""
 "��ิ�ิ��ี��ลือ�มี�ห�ุ�าร��สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า��ห�ุ�าร���หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
 msgstr ""
 "ราย�ารภาร�ิ��ี��ลือ�มีภาร�ิ�สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า�ภาร�ิ��หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18296,7 +18018,10 @@ msgstr ""
 "ราย�าร�ั��ึ���วย�ำ�ลือ�มี�ั��ึ���วย�ำสำหรั��มล�ี��ำห��อยู���อ��ล�ว "
 "�ุ���อ��าร�ะสร�า��ั��ึ���วย�ำ�หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18308,7 +18033,10 @@ msgstr[0] ""
 msgstr[1] ""
 "��ิ�ิ��ี��ลือ�มี�ห�ุ�าร��สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า��ห�ุ�าร���หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18320,7 +18048,10 @@ msgstr[0] ""
 msgstr[1] ""
 "ราย�ารภาร�ิ��ี��ลือ�มีภาร�ิ�สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า�ภาร�ิ��หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18334,77 +18065,77 @@ msgstr[1] ""
 "ราย�าร�ั��ึ���วย�ำ�ี��ลือ�มี�ั��ึ���วย�ำสำหรั��มล�ี��ำห��อยู���อ��ล�ว "
 "�ุ���อ��าร�ะสร�า��ั��ึ���วย�ำ�หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[�ม�มีสรุ�]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "���รั�อ�อ�������ี��ม��ู���อ��ื�มา�า���ิร���วอร�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "��ิ���อ�ิ��ลา���ะ�ระมวล�ล: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "�ม�สามาร���ิ���ิ�ิ�  %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "�หล���ี��ลือ�สามาร�อ�า����อย�า���ียว �ึ��ม�สามาร�สร�า��ห�ุ�าร���ี��ั�� �รุ�า�ลือ��หล���หม�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "�หล���ี��ลือ�สามาร�อ�า����อย�า���ียว �ึ��ม�สามาร�สร�า�ภาร�ิ��ี��ั�� �รุ�า�ลือ��หล���หม�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr ""
 "�หล���ี��ลือ�สามาร�อ�า����อย�า���ียว �ึ��ม�สามาร�สร�า��ั��ึ���วย�ำ�ี��ั�� �รุ�า�ลือ��หล���หม�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "�ม�สามาร�อ�า�ราย�ื�อ�หล�� %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "สร�า��_ห�ุ�าร��"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "สร�า��ห�ุ�าร���หม��า���อ�วาม�ี��ลือ�อยู�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "สร�า�_�ั��ึ���วย�ำ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "สร�า��ั��ึ���วย�ำ�หม��า���อ�วาม�ี��ลือ�อยู�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "สร�า�_ภาร�ิ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "สร�า�ภาร�ิ��หม��า���อ�วาม�ี��ลือ�อยู�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "สร�า��าร_�ระ�ุม"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "สร�า��าร�ระ�ุม�หม��า���อ�วาม�ี��ลือ�อยู�"
 
@@ -18412,55 +18143,55 @@ msgstr "สร�า��าร�ระ�ุม�หม��า���อ
 msgid "Convert a mail message to a task."
 msgstr "��ล���อ�วาม�มล�ห�����ภาร�ิ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "�ู_�รุ��อ�วาม���า�อ�ลิส��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "�ู�รุ��อ�วาม���า�อ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "�ู��อมูล_วิ�ี����อ�ลิส��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "�ู��อมูล��ี�ยว�ั�วิ�ี����อ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "�ิ���อ�_��า�อ�ลิส��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "�ิ���อ���า�อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_ส����อ�วาม���าลิส��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ส����อ�วาม���า�มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "ส_มั�ร���าลิส��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "สมั�ร����สมา�ิ��อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "�_ลิ��อ�รั���อมูล�า�ลิส��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "ย��ลิ��ารสมั�ร����สมา�ิ��อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "�_มลลิ�ลิส��"
 
@@ -18561,15 +18292,15 @@ msgstr ""
 "�ะ�ำ��รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว����ล��อร��ั��ุ�ั����า�ั�� "
 "หรือ�ะ�ำ��รื�อ�หมาย����ล��อร�ย�อย�ั��หม���วย?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:188
 msgid "In Current Folder and _Subfolders"
 msgstr "����ล��อร��ั��ุ�ั��ละ��ล��อร�_ย�อย"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:202
 msgid "In Current _Folder Only"
 msgstr "����ล��อร�_�ั��ุ�ั����า�ั��"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:425
 msgid "Mark Me_ssages as Read"
 msgstr "�ำ��รื�อ�หมาย�ุ�_��อ�วามว�าอ�า��ล�ว"
 
@@ -18628,39 +18359,39 @@ msgstr "�ิยม�����อ�วาม��ล�า"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "�ส����อ�วาม�มล�����อ�วาม��ล�า �ม���ื�อหา�ะ���� HTML"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "�ส�� HTML ��าส��มา��วย"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "�ห� Evolution �ลือ��ส��ส�ว��ี��ี�ี�สุ��ี�ส��มา"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "�ส����อ�วาม��ล�า��าส��มา��วย"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "�ส��ส�ว���อ�วาม��ล�า��าส��มา��วย มิ�ะ�ั�� ���ห� Evolution �ลือ��ส��ส�ว��ี��ี�ี�สุ��ี�ส��มา"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "�ส����อ�วาม��ล�า���า�ั��"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "�ส��ส�ว��ี�������อ�วาม��ล�า���า�ั�� �ละ�ำส�ว�อื���ห��������ม�����าร�อ��อ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "�ส��ส�ว� HTML �ี�_�ั������������ม���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "�_หม� HTML"
 
@@ -18684,31 +18415,35 @@ msgstr "��รื�อ�มือ�ำ���า Outlook PST"
 msgid "Outlook personal folders (.pst)"
 msgstr "��ล��อร�ส�ว��ุ��ล�อ� Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "�_มล"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "��ล��อร��ลาย�า�:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "_สมุ��ี�อยู�"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "_�ั�หมาย"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_ภาร�ิ�"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "ราย�าร_�ั��ึ�"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "�ำลั��ำ���า��อมูล Outlook"
 
@@ -18866,55 +18601,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "�ม�สามาร���ะ�ระ�าศ��ิ�ิ�: �����อ�����ิ�ิ��ม�มีอยู�อี���อ��"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "�หล���หม�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "������หล��"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "�ม��� SpamAssassin, รหัส: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "�ม�สามาร�สร�า�����: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "��ิ���อ�ิ��ลา�หลั� fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:231
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "��ร��สลู� SpamAssassin �ม��อ�ส�อ� �ะ��า�ิ��..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:233
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "�าร�อย��ร��สลู� SpamAssassin �ู��ั��ั�หวะ �ะ����ร��รม..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:242
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "สร�า�������ยั� SpamAssassin �ม�สำ�ร�� รหัส��อ�ิ��ลา�: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:505
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "�ม�มี SpamAssassin ��ระ�� �รุ�า�ิ��ั���สีย��อ�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:926
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�าร��สอ��ี��ะ�ำ�ห� SpamAssassin ��า��ื�อ�ือ�ึ�� ����ำ�า���าล�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:934
 msgid "I_nclude remote tests"
 msgstr "_��สอ��ฮส��ระยะ��ล��วย"
 
@@ -19031,77 +18766,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "รู���� RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "รู��_��:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "�ลือ����ม�ลาย�า�"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "�ั��ึ���ิ�ิ��ี��ลือ�ล��ิส��"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "�ั��ึ�ราย�าร�ั��ึ���วย�ำ�ี��ลือ�ล��ิส��"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "�ั��ึ�ราย�ารภาร�ิ��ี��ลือ�ล��ิส��"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "�ำ�ุ�สู��าร�ั����า�ั��ี�ริ�ม�ร�"
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "�ู���วย�ั����า"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "�ู���วย�ั����า Evolution"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "ยิ��ี��อ�รั�"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"ยิ��ี��อ�รั�สู� Evolution  ห��า�อ�ั����ี� �ะ�ั����า Evolution �ห���ื�อม��อ�ั��ั��ีอี�มล�อ��ุ� "
-"�ละ�ำ���า���ม��อมูล�า���ร��รมอื��\n"
-"\n"
-"�รุ�า���ุ�ม \"�ั���\" ��ื�อ�ำ�า���อ"
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "�รุ�า�ลือ���อมูล�ี��ุ���อ��าร�ำ���า:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "�า� %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "�าร�ำ���า���ม"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "�ำลั��ำ���า��อมูล"
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "�รุ�ารอสั��รู�"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "�ั��ระ�ู���อ�วาม�มล�ามหัว��อ�รื�อ�"
@@ -19115,7 +18799,7 @@ msgid "Thread messages by subject"
 msgstr "�ั��ระ�ู���อ�วาม�ามหัว��อ�รื�อ�"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "�ยายาม�ั�_�ระ�ู��ามหัว��อ�รื�อ�"
 
@@ -19129,15 +18813,15 @@ msgstr "ราย�าร�ู� �ำหลั�/��า สำหรั
 msgid "Drafts based template plugin"
 msgstr "�ลั��อิ��ม�����ี�อาศัย���ร�า�"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:615
 msgid "No Title"
 msgstr "�ม�มี�ื�อ"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:686
 msgid "Save as _Template"
 msgstr "�ั��ึ������_ม����"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:688
 msgid "Save as Template"
 msgstr "�ั��ึ������ม����"
 
@@ -19157,27 +18841,27 @@ msgstr "vCard ���รร�ั�"
 msgid "Show vCards directly in mail messages."
 msgstr "�ส�� vCard ล�����อ�วาม�มล��ย�ร�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "�ส�� vCard ������ม"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "�ส�� vCard ����ระ�ั�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "มี�ู��ิ���ออื��ห�ึ��ราย�าร"
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "มี�ู��ิ���ออื�� %d ราย�าร"
 msgstr[1] "มี�ู��ิ���ออื�� %d ราย�าร"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "�ั��ึ�ล���สมุ��ี�อยู�"
 
@@ -19193,11 +18877,11 @@ msgstr "�ี�อยู��ิ���อ WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "หลี��_ลี�ย� IfMatch (�ำ����สำหรั� Apache < 2.2.8)"
 
@@ -19355,7 +19039,7 @@ msgstr "�ส�������า�"
 msgid "Skip development warning dialog"
 msgstr "��าม�ล�อ�����อ���ือ�ส�า�ะ�ำลั��ั��า"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:322
 msgid "Start in offline mode"
 msgstr "�ริ�ม���หม�ออ��ล��"
 
@@ -19506,143 +19190,46 @@ msgstr "รู�����อ��ุ�มห��า��า�"
 msgid "Window buttons are visible"
 msgstr "�ส���ุ�มห��า��า�"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "�าร���หา"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "�ั��ึ��าร���หา"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "�_ส��:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "_���หา:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "�_�"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "รู���������รื�อ�มือ"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "รู�����อ������รื�อ�มือ�อ��ัวสลั�"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "�ส�������รื�อ�มือ"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "�ำห��ว�า�ะ�ส���ัวสลั�หรือ�ม�"
-
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:249
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:270
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "�ุ����มi (*)"
 
-#: ../shell/e-shell-view.c:681
-msgid "Switcher Action"
-msgstr "�าร�ระ�ำ�อ��ัวสลั�"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr "�าร�ระ�ำ�อ��ัวสลั�สำหรั�มุมมอ���ลล��ี�"
-
-#: ../shell/e-shell-view.c:697
-msgid "Page Number"
-msgstr "หมาย�ล�ห��า"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr "หมาย�ล�ห��าสมุ��อ�มุมมอ���ลล�"
-
-#: ../shell/e-shell-view.c:714
-msgid "Search Rule"
-msgstr "���าร���หา"
-
-#: ../shell/e-shell-view.c:715
-msgid "Criteria for the current search results"
-msgstr "��ื�อ���สำหรั��ล�าร���หา�ั��ุ�ั�"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr "EShellBackend สำหรั�มุมมอ���ลล��ี�"
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr "วิ�������ื�อหา��ลล�"
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr "วิ�������ื�อหา�ะ�รา������อ���า��วา�อ�ห��า��า���ลล�"
-
-#: ../shell/e-shell-view.c:762
-msgid "Shell Sidebar Widget"
-msgstr "วิ����������า��อ���ลล�"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "วิ����������า��ะ�รา������อ���า���าย�อ�ห��า��า���ลล�"
-
-#: ../shell/e-shell-view.c:778
-msgid "Shell Taskbar Widget"
-msgstr "วิ���������า��อ���ลล�"
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "วิ���������า��ะ�รา���ี���า�ล�า��อ�ห��า��า���ลล�"
-
-#: ../shell/e-shell-view.c:794
-msgid "Shell Window"
-msgstr "ห��า��า���ลล�"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr "ห��า��า��ี��������า�อ�มุมมอ���ลล��ี�"
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr "���ม�ีย��ึ��������อมูลส�า�ะ�อ�วิ�����"
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr "�ื�อ�อ�มุมมอ���ลล��ี�"
-
-#: ../shell/e-shell-view.c:840
-msgid "Current View ID"
-msgstr "ID �อ�มุมมอ��ั��ุ�ั�"
-
-#: ../shell/e-shell-view.c:841
-msgid "The current GAL view ID"
-msgstr "ID �อ�มุมมอ� GAL �ั��ุ�ั�"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19659,404 +19246,317 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "�ว������ Evolution"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Bug Buddy is not installed."
 msgstr "�ม�����ิ��ั����รื�อ�มือราย�า��ั�� (Bug Buddy)"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy could not be run."
 msgstr "�รีย���รื�อ�มือราย�า��ั�� (Bug Buddy) �ม�สำ�ร��"
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1354
 msgid "GNOME Pilot is not installed."
 msgstr "�ม�����ิ��ั�� GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1356
 msgid "GNOME Pilot could not be run."
 msgstr "�รีย� GNOME Pilot �ม�สำ�ร��"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Show information about Evolution"
 msgstr "�ส����อมูล��ี�ยว�ั� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1469
 msgid "_Close Window"
 msgstr "�ิ_�ห��า��า�"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1476
 msgid "_Contents"
 msgstr "��ื�อ_หา"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1478
 msgid "Open the Evolution User Guide"
 msgstr "��ิ��ู�มือ�ู�����อ� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Evolution _FAQ"
 msgstr "�ำ_�าม�ี��าม��อย��ี�ยว�ั� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "��ิ��ว��ห��า�ำ�าม�ี��าม��อย"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1511
 msgid "_Forget Passwords"
 msgstr "_�ิ��รหัส��า�"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1513
 msgid "Forget all remembered passwords"
 msgstr "�ิ��รหัส��า��ี������ว��ั��หม�"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1518
 msgid "I_mport..."
 msgstr "�ำ�_��า..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Import data from other programs"
 msgstr "�ำ���า��อมูล�า���ร��รมอื��"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1525
 msgid "New _Window"
 msgstr "_ห��า��า��หม�"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Create a new window displaying this view"
 msgstr "��ิ�ห��า��า��หม���ย�ส��มุมมอ��ี�"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Configure Evolution"
 msgstr "�ั����า Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1546
 msgid "_Quick Reference"
 msgstr "�อ�สาร_อ�า�อิ���ว�"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Show Evolution's shortcut keys"
 msgstr "�ส���ุ�มลั��อ� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Exit the program"
 msgstr "ออ��า���ร��รม"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1560
 msgid "_Advanced Search..."
 msgstr "_���หา�ั��สู�..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Construct a more advanced search"
 msgstr "สร�า�ราย�าร���หา�ั��สู��ึ����"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Clear the current search parameters"
 msgstr "ล�า��ารามิ��อร��าร���หา�ั��ุ�ั�"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Edit Saved Searches..."
 msgstr "�_�����าร���หา�ี��ั��ึ��ว�..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Manage your saved searches"
 msgstr "�ั��าร�าร���หา�ี��ั��ึ��ว��อ��ุ�"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1583
 msgid "Click here to change the search type"
 msgstr "�ลิ��ี��ี���ื�อ��ลี�ย���ิ��อ��าร���หา"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1588
 msgid "_Find Now"
 msgstr "_หา��ี�ยว�ี�"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Execute the current search parameters"
 msgstr "�รีย�����ารามิ��อร����หา�ั��ุ�ั�"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Save Search..."
 msgstr "_�ั��ึ��าร���หา..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Save the current search parameters"
 msgstr "�ั��ึ��ารามิ��อร����หา�ั��ุ�ั�"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1609
 msgid "Send / _Receive"
 msgstr "_รั� / ส��"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Send queued items and retrieve new items"
 msgstr "ส����อ�วาม�ี�อยู����ิว�ละ�ึ���อ�วาม�หม�"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1616
 msgid "Submit _Bug Report..."
 msgstr "ส��_ราย�า��ุ����ร�อ�..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ส��ราย�า��ุ����ร�อ���วย��รื�อ�มือราย�า��ั��"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1623
 msgid "GNOME Pilot _Synchronization..."
 msgstr "�าร_�รั���อมูล�ห��ร��ั� GNOME Pilot..."
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1625
 msgid "Set up GNOME Pilot configuration"
 msgstr "�ั����า GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_Work Offline"
 msgstr "�ำ�า�ออ_��ล��"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1632
 msgid "Put Evolution into offline mode"
 msgstr "�ำ Evolution ���าสู��หม�ออ��ล��"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Work Online"
 msgstr "�ำ�า�ออ_��ล��"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1639
 msgid "Put Evolution into online mode"
 msgstr "�ำ Evolution ���าสู��หม�ออ��ล��"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1667
 msgid "Lay_out"
 msgstr "�าร_�ั�วา�"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1674
 msgid "_New"
 msgstr "สร�า��_หม�"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Search"
 msgstr "_���หา"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1688
 msgid "_Switcher Appearance"
 msgstr "รู�����อ�_�ุ�ม�ลือ�"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1702
 msgid "_Window"
 msgstr "_ห��า��า�"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1731
 msgid "Show Side _Bar"
 msgstr "�ส�����_��า�"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Show the side bar"
 msgstr "�ส�������า�"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Show _Buttons"
 msgstr "�ส���ุ�_ม"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1741
 msgid "Show the switcher buttons"
 msgstr "�ส���ุ�ม�อ��ัวสลั�"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Show _Status Bar"
 msgstr "�ส�����_ส�า�ะ"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Show the status bar"
 msgstr "�ส�����ส�า�ะ"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Show _Tool Bar"
 msgstr "�ส���_����รื�อ�มือ"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Show the tool bar"
 msgstr "�ส�������รื�อ�มือ"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1779
 msgid "_Icons Only"
 msgstr "�_อ�อ����า�ั��"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons with icons only"
 msgstr "�ส���ุ�มห��า��า���วย�อ�อ����า�ั��"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1786
 msgid "_Text Only"
 msgstr "_��อ�วาม���า�ั��"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1788
 msgid "Display window buttons with text only"
 msgstr "�ส���ุ�มห��า��า���วย��อ�วาม���า�ั��"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1793
 msgid "Icons _and Text"
 msgstr "�อ�อ��_ละ��อ�วาม"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1795
 msgid "Display window buttons with icons and text"
 msgstr "�ส���ุ�มห��า��า���วย�อ�อ��ละ��อ�วาม"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Tool_bar Style"
 msgstr "รู��_�������รื�อ�มือ"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1802
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "�ส���ุ�ม�ลือ�ห��า��า���ย�����า�ั����ียว�ั������รื�อ�มือ"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Define Views..."
 msgstr "�ำห��มุมมอ�..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1812
 msgid "Create or edit views"
 msgstr "สร�า�หรือ�����มุมมอ�"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Save Custom View..."
 msgstr "�ั��ึ�มุมมอ��ำห���อ�..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1819
 msgid "Save current custom view"
 msgstr "�ั��ึ�มุมมอ��ำห���อ��ั��ุ�ั�"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1826
 msgid "C_urrent View"
 msgstr "มุมมอ�_�ั��ุ�ั�"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1836
 msgid "Custom View"
 msgstr "มุมมอ��ำห���อ�"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1838
 msgid "Current view is a customized view"
 msgstr "มุมมอ��ั��ุ�ั�����มุมมอ��ี��ำห���อ�"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1848
 msgid "Change the page settings for your current printer"
 msgstr "��ลี�ย��าร�ั����าห��า�ระ�าษสำหรั���รื�อ��ิม���ั��ุ�ั��อ��ุ�"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2227
 #, c-format
 msgid "Switch to %s"
 msgstr "��ลี�ย����ี�%s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2440
 msgid "Execute these search parameters"
 msgstr "�รีย�����ารามิ��อร����หา�หล�า�ี�"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
+#: ../shell/e-shell-window-private.c:574
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "สร�า��หม�"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "มุมมอ���ลล��ี��ำ�า�อยู�"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "�ื�อ�อ�มุมมอ���ลล��ี��ำ�า�อยู�"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "EFocusTracker �อ�ห��า��า���ลล�"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
-msgid "Geometry"
-msgstr "�ร�า��ิ�"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
-msgid "Initial window geometry string"
-msgstr "��อ�ำห���ร�า��ิ��ริ�ม�ร��อ�ห��า��า�"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "�หม��ลอ�ภัย"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "ระ�ุว�าห��า��า���ลล�อยู����หม��ลอ�ภัยหรือ�ม�"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "�ส�������า�"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "�ำห��ว�า�ะ�ส�������า���ห��า��า���ลล�หรือ�ม�"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "�ส���ัวสลั�"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "�ำห��ว�า�ะ�ส���ุ�ม��า�� �อ��ัวสลั���ห��า��า���ลล�หรือ�ม�"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "�ส������า�"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "�ำห��ว�า�ะ�ส������า��อ�ห��า��า���ลล�หรือ�ม�"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "�ำห��ว�า�ะ�ส�������รื�อ�มือ�อ�ห��า��า���ลล�หรือ�ม�"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "�ู��ั��าร UI"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "GtkUIManager �อ�ห��า��า���ลล�"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:224
 msgid "Preparing to go offline..."
 msgstr "�ำลั���รียม���าสู��หม�ออ��ล��..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:274
 msgid "Preparing to go online..."
 msgstr "�ำลั���รียม���าสู��หม�ออ��ล��..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:342
 msgid "Preparing to quit..."
 msgstr "�ำลั���รียมออ��า���ร��รม..."
 
-#: ../shell/e-shell.c:820
-msgid "Module Directory"
-msgstr "���ร��อรีสำหรั�มอ�ูล"
-
-#: ../shell/e-shell.c:821
-msgid "The directory from which to load EModules"
-msgstr "���ร��อรี�ี��ะ����หล� EModule ��า��"
-
-#: ../shell/e-shell.c:836
-msgid "Network Available"
-msgstr "มี��รือ��าย�ห�����า����"
-
-#: ../shell/e-shell.c:837
-msgid "Whether the network is available"
-msgstr "ระ�ุว�ามี��รือ��าย�ห�����า����หรือ�ม�"
-
-#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "ออ��ล��"
-
-#: ../shell/e-shell.c:853
-msgid "Whether the shell is online"
-msgstr "ระ�ุว�า��ลล�ออ��ล��อยู�หรือ�ม�"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:173
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20090,7 +19590,7 @@ msgstr ""
 "�ราหวั�ว�า�ุ��ะ�ึ��อ���ั��ล�อ��าร�ำ�า�อย�า�ห�ั��อ��รา\n"
 "�ละ�รา�ำลั�รอ�อย�ารร�วมสม���อ��ุ�อย�า���������อ!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:197
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20098,51 +19598,47 @@ msgstr ""
 "�อ�อ��ุ�\n"
 "�ีม�า� Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:204
 msgid "Do not tell me again"
 msgstr "�ม���อ��อ��ั�อี�"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:318
 msgid "Start Evolution activating the specified component"
 msgstr "�รีย� Evolution ��ย��ิ����อ����ระ�อ��ี��ำห��"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:320
 msgid "Apply the given geometry to the main window"
 msgstr "�����อ�ำห���ร�า��ิ��ี�ระ�ุ�ั�ห��า��า�หลั�"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Start in online mode"
 msgstr "�ริ�ม�ำ�า����หม�ออ��ล��"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:326
 msgid "Start in \"express\" mode"
 msgstr "�ริ�ม�ำ�า����หม� \"�ร����ว�\""
 
-#: ../shell/main.c:333
+#: ../shell/main.c:329
 msgid "Forcibly shut down Evolution"
 msgstr "�ั��ั��ิ� Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "�ั��ั��รั�รุ����อมูล�หม��า� Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:332
 msgid "Send the debugging output of all components to a file."
 msgstr "ส����อ�วาม�ี�ั���อ��ุ�อ����ระ�อ�ล����ม"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:334
 msgid "Disable loading of any plugins."
 msgstr "�ิ��าร�หล��ลั��อิ����"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:336
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "�ม������อ��ส���ัวอย�า�สำหรั��มล, �ู��ิ���อ �ละภาร�ิ�"
 
-#: ../shell/main.c:348
+#: ../shell/main.c:340
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "�ำ���า URI หรือ�ื�อ���ม�าม�ี�ระ�ุมา��อาร��ิว�ม����ี��หลือ�ั��หม�"
 
-#: ../shell/main.c:350
+#: ../shell/main.c:342
 msgid "Request a running Evolution process to quit"
 msgstr "ร�อ��อ�ห��ิ���ร��ส Evolution �ี��ำ�า�อยู�"
 
@@ -20150,7 +19646,7 @@ msgstr "ร�อ��อ�ห��ิ���ร��ส Evolution �ี
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution: ��ร��รม�ั��าร��อมูลส�ว��ุ��ล�ละ��ล�อ���อี�มล"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:516
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20164,91 +19660,39 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��าร�ิ��รหัส��า��ี������ว��ั��หม�?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "��อ��"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "�ม�สามาร��รั�รุ����ย�ร��า�รุ�� {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "ล���อมูล���า�า�รุ�� {0} หรือ�ม�?"
+msgid "Continue Anyway"
+msgstr "ยั����ำ��อ��"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr "�าร�ิ��รหัส��า��ี� �ะล�รหัส��า��ุ�รหัส�ี��ำ�ว��ั��หม� �ละ�ะ�ามรหัส��า��ุ��หม����รั����อ��"
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "�ี�ว�า����ิส���ม���ีย��อสำหรั��าร�รั�����รุ���หม�"
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "ล���อมูล���า�ริ�หรือ�ม�?"
+msgid "Quit Now"
+msgstr "ออ���ี�ยว�ี�"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"��ื�อหา�ั��หม��อ����ร��อรี &quot;evolution&quot; �ำลั��ะ�ู�ล��ิ��อย�า��าวร\n"
-"\n"
-"�อ��ะ�ำว�า �ุ��วร�รว�สอ��ห�������สีย��อ� ว�า��อมูล�มล �ู��ิ���อ �ละ��ิ�ิ��อ��ุ�ยั�อยู��ร��ั��หม� "
-"�ละ Evolution รุ���ี��ำ�า�อย�า��ู���อ� ��อ��ี��ะล���อมูล���า�หล�า�ี�\n"
-"\n"
-"�มื�อล��ล�ว �ุ��ะ�ม�สามาร��รั�รุ���อ� Evolution �ลั�ล�มา����รุ�����า��ยอั���มั�ิ "
-"��ย�ม���อ���ล�สิ����า�� ��วย�ัว�อ����อี���อ��\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"Evolution รุ����อ�������อมูล�ว���ละ�ห��\n"
-"\n"
-"��า�ุ��ลือ��ี��ะล���อมูล�ุ��ี� ��ื�อหา�ั��หม��อ����ร��อรี &quot;evolution&quot; "
-"�ะ�ู�ล��ิ��อย�า��าวร ��า�ุ��ลือ��ี��ะ������อมูล�ุ��ี��ว� �ุ�ยั�สามาร�ล����ร��อรี &quot;"
-"evolution&quot; ��วย�ัว�อ���ภายหลั�����ามสะ�ว�\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "�รั�รุ���า�รุ����อ��ม�สำ�ร��:"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"�าร�รั���อมูล�ละ��า�ั������รุ���หม� �ะ��อ��าร��ื�อ�ี��ิส�� {0} ����ุ�มี��ื�อ�ี�ว�า�อยู���ีย� {1}\n"
-"\n"
-"�ุ��ำ������อ�หา��ื�อ�ี�ว�า�มา��ว�า�ี������ร��อรี��า��อ��ุ� ��อ��ี��ะ�ำ��ิ��าร��อ��"
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_�ิ��รหัส��า�"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "�_�����อมูล�ว�"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "�_�ือ�อี��ราวห��า"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20340,7 +19784,7 @@ msgstr "�ัว�ลือ���ี�ยว�ั��าร�ั��
 msgid "Show session management options"
 msgstr "�ส���ัว�ลือ���ี�ยว�ั��าร�ั��ารวาระ"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20396,7 +19840,7 @@ msgstr "�ื�อ��รั�รอ�"
 msgid "Purposes"
 msgstr "�ุ��ระส���"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "หมาย�ล�ลำ�ั�"
@@ -20417,19 +19861,19 @@ msgstr "�ี�อยู�อี�มล"
 msgid "All CA certificate files"
 msgstr "���ม��รั�รอ� CA �ั��หม�"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "��รั�รอ�"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "��รื�อ�มือ�ู��รั�รอ�: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "��อ�รหัส��า�สำหรั� `%s'"
+msgid "Enter the password for '%s'"
+msgstr "��อ�รหัส��า�สำหรั� '%s'"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20459,7 +19903,7 @@ msgstr ""
 "ออ��ห���ย:\n"
 "    �รื�อ�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "�ลือ���รั�รอ�"
 
@@ -20472,14 +19916,10 @@ msgid "Authorities"
 msgstr "อ����ร"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "สำรอ�"
+msgid "Backup _All"
+msgstr "สำรอ�_�ั��หม�"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "สำรอ��ั��หม�"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20487,161 +19927,153 @@ msgstr ""
 "��อ��ี��ะ��ื�อ�ือ CA �ี���ื�อ�ุ��ระส������ �ุ��วร�รว�สอ���รั�รอ��ี� "
 "�ร�อม�ั����ย�าย�ละ�ระ�ว��าร��วย (��ามี)"
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "��รั�รอ�"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "�วาม��ื�อ�ืออ����รออ���รั�รอ�"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "�����อมูล��รั�รอ�"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "ลำ�ั��ั����รั�รอ�"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "รายละ�อีย���รั�รอ�"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "�ารา���รั�รอ�"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "�ื�อสามั� (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "��รั�รอ��อ��ู��ิ���อ"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "�ม���ื�อ�ือ�วาม����อ���รั�รอ��ี�"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "�����"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "��า�ั���วาม��ื�อ�ือ��รั�รอ�อี�มล"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "��รั�รอ��ู�รั�อี�มล"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "��รั�รอ��ู������ำ�ั�อี�มล"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "หม�อายุ"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "��า�อ������อมูล"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "ลาย�ิ�วมือ"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "�ำ���า"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "ออ��ห���ย"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ออ��ห��มื�อ"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "ออ��ห��ั�"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "ลาย�ิ�วมือ MD5"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "อ����ร (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "ห��วย�า�อ����ร (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "ลาย�ิ�วมือ SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "��รั�รอ�ลู���าย SSL"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "��รั�รอ��ม���าย SSL"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "��รั�รอ��ี���า��าร�รว�สอ��ล�วสำหรั��าร����า���อ���ี�:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "��ื�อ�ือ�วาม����อ���รั�รอ��ี�"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "��ื�อ�ือ CA �ี����ารระ�ุ�ู����อี�มล"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "��ื�อ�ือ CA �ี����ารระ�ุ�ั��ั��า�อ����วร�"
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
-msgstr "��ื�อ�ือ CA �ี����ารระ�ุ�ว������"
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
+msgstr "��ื�อ�ือ CA �ี����าร����ี��ว��������า��"
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "อายุ����า�"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "�ู"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "�ุ�มี��รั�รอ��า�อ����ร��อ���ี��ึ��ระ�ุ�ัว�ุ�:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "�ุ�มี��รั�รอ������ม�ึ��ระ�ุอ����รรั�รอ���อ���ี�:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "�ุ�มี��รั�รอ������ม�ึ��ระ�ุ�ุ��ล��อ���ี�:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "��รั�รอ��อ��ุ�"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "_สำรอ�"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "�_�����วาม��ื�อ�ือ CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:734
 msgid "Certificate already exists"
 msgstr "มี��รั�รอ�อยู��ล�ว"
 
@@ -20686,125 +20118,143 @@ msgstr "MD5 �ร�อม�าร���ารหัสลั� RSA �า
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "SHA-1 �ร�อม�าร���ารหัสลั� RSA �าม PKCS #1"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "SHA-256 �ร�อม�าร���ารหัสลั� RSA �าม PKCS #1"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "SHA-384 �ร�อม�าร���ารหัสลั� RSA �าม PKCS #1"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "SHA-512 �ร�อม�าร���ารหัสลั� RSA �าม PKCS #1"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "�าร���ารหัสลั� RSA �าม PKCS #1"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "�าร����ุ�����รั�รอ�"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "��ิ���รั�รอ��อ�����ส���"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "�ัวระ�ุ�ุ���อ����รออ���รั�รอ�"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "�ัวระ�ุอ�อ������ (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "�ัวระ�ุอัล�อริ�ึม"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "�ารามิ��อร��อ�อัล�อริ�ึม"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "��อมูล�ุ���สา�าร�ะ�อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "อัล�อริ�ึม�อ��ุ���สา�าร�ะ�อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "�ุ���สา�าร�ะ�อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "��อ�ิ��ลา�: �ม�สามาร��ระมวล�ลส�ว��ยาย"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "�ู������ำ�ั�อ�อ������"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "อ����รออ���รั�รอ� SSL"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "อ����รออ���รั�รอ�อี�มล"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "�าร�����ำ�ั�"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "�ารรั�รอ��วาม���"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "�าร���ารหัสลั��ุ���"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "�าร���ารหัสลั���อมูล"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "�ารยอมรั��ุ���"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "��������ำ�ั���รั�รอ�"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "��������ำ�ั� CRL"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "สำ�ั�มา�"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "�ม�สำ�ั�มา�"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "ส�ว��ยาย"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "อัล�อริ�ึมสำหรั�ลาย������รั�รอ�"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "ออ��ห���ย"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ID �อ�ลั�ษ���อ��ู�ออ��ห�"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "ID �อ�ลั�ษ���อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "��า�อ�ลาย�����อ���รั�รอ�"
 
@@ -20893,11 +20343,11 @@ msgid "With _Status"
 msgstr "�ส��_ส�า�ะ"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -20926,19 +20376,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "�าร�_ลือ�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "�ุ���อมูล"
-
-#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "�ำห��มุมมอ�สำหรั� %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "�ำห��มุมมอ�"
 
@@ -20951,11 +20396,7 @@ msgstr "�ำห��มุมมอ�สำหรั� \"%s\""
 msgid "Table"
 msgstr "�ารา�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "วั��ุ"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "�ั��ึ�มุมมอ��ั��ุ�ั�"
 
@@ -20967,11 +20408,7 @@ msgstr "_สร�า�มุมมอ��หม�"
 msgid "_Replace existing view"
 msgstr "����_��มุมมอ��ี�มีอยู�"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "�ร��า�"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "�ำห��มุมมอ��หม�"
 
@@ -20991,22 +20428,10 @@ msgstr "��ิ��อ�มุมมอ�:"
 msgid "De_fault"
 msgstr "_�ริยาย"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "�ื�อ�ั��ี"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "��ร���อล"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "��ิ�ั�ิ�าร"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "อ�อ������ GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "�ุ�สม�ั�ิ���ม���"
@@ -21024,11 +20449,11 @@ msgstr "��ิ� MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "�ห��_ส�����ม����ี���ยอั���มั�ิ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "�ม�สามาร��ั�������ื��หลั����"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "�ั������_�ื��หลั�"
 
@@ -21046,13 +20471,13 @@ msgstr "_ส����ยั�..."
 msgid "Send the selected attachments somewhere"
 msgstr "ส�����ม����ี��ลือ���ยั��ห���ี���อ��าร"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "�ำลั��หล�"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "�ำลั��ั��ึ�"
 
@@ -21061,13 +20486,10 @@ msgid "Hide Attachment _Bar"
 msgstr "��อ��_�����ม���"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:605
 msgid "Show Attachment _Bar"
 msgstr "�ส���_�����ม���"
 
-#: ../widgets/misc/e-attachment-paned.c:636
-msgid "Show _Attachment Bar"
-msgstr "�ส���_�����ม���"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "��ิ�ม���ม���"
@@ -21084,32 +20506,32 @@ msgstr[1] "�ั��ึ����ม���"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:301
 msgid "S_ave All"
 msgstr "�ั��ึ��ั��ห_ม�"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "A_dd Attachment..."
 msgstr "�_�ิ�ม���ม���..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "_Hide"
 msgstr "_��อ�"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:358
 msgid "_View Inline"
 msgstr "�_ส�����รร�ั�"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:640
 #, c-format
 msgid "Open with \"%s\""
 msgstr "��ิ���วย \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "��ิ����ม����ี��� %s"
@@ -21118,59 +20540,59 @@ msgstr "��ิ����ม����ี��� %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "��อ�วาม�ี����"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "มี�าร�หล�อยู�ระหว�า��ำ��ิ��าร"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "มี�าร�ั��ึ�อยู�ระหว�า��ำ��ิ��าร"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "�ม�สามาร��หล� '%s'"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "�ม�สามาร��หล����ม���"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "�ม�สามาร���ิ� '%s'"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "�ม�สามาร���ิ����ม���"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "�ม�����หล���ื�อหา�อ����ม���"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "�ม�สามาร��ั��ึ� '%s'"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, c-format
 msgid "Could not save the attachment"
 msgstr "�ม�สามาร��ั��ึ����ม���"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-�ลิ���ื�อ��ิ�ลิ���"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B %Ey"
 
@@ -21178,65 +20600,6 @@ msgstr "%B %Ey"
 msgid "Month Calendar"
 msgstr "��ิ�ิ���ือ�"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "สี��ิม"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "สี��ิม�อ� GDK"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "ลาย�ี�ระ�าย"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "�วาม�ว�า���ำสุ�"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "�วาม�ว�า���ำสุ�"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "�าร�ว����อ�ว�า�"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "รหัสอั��ระ"
@@ -21249,91 +20612,88 @@ msgstr "�ส��ุ�อั��ระ�ี��ะ���"
 msgid "Other..."
 msgstr "อื��� ..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "วั��ละ�วลา"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "ราย�าร��อ�วาม��ื�อ��อ���อมูลวั��ี�"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "�ลิ��ี��ุ�ม�ี���ื�อ�ส����ิ�ิ�"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "�ล�อ��ึ�ล�����สม��ื�อ�ลือ��วลา"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_��ะ�ี�"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_วั��ี�"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "�_ม�มี"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "วั��ี��ม��ู���อ�"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "�วลา�ม��ู���อ�"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "�ลือ����ม�ี��ุ���อ��าร�ำ���ามายั� Evolution �ล�ว�ลือ���ิ��อ����ม�ั��ล�าว�า�ราย�ื�อ"
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:259
 msgid "F_ilename:"
 msgstr "�ื�อ�_��ม:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "Select a file"
 msgstr "�ลือ����ม"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
 msgid "File _type:"
 msgstr "_��ิ����ม:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Choose the destination for this import"
 msgstr "�ลือ��ลาย�า��อ��าร�ำ���า�ี�"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
 msgid "Choose the type of importer to run:"
 msgstr "�ลือ���ิ��อ��าร�ำ���า�ี��ะ�ำ:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
 msgid "Import data and settings from _older programs"
 msgstr "�ำ���า��อมูล�ละ��า�ั���า���ร��รม�_��า"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
 msgid "Import a _single file"
 msgstr "�ำ���า���ม���ม�_�ียว"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "�ลือ���ิ��อ����ม�ี��ุ���อ��าร�ำ���า�า�ราย�ื�อ"
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21343,17 +20703,38 @@ msgstr ""
 "iCalendar ����ม�����า�ั���ี�สามาร��ำ���า����ลย ��า�ุ���อ��ารลอ��หม�อี��รั�� �รุ�า�ลิ��ุ�ม "
 "\"ย�อ��ลั�\""
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+msgid "_Cancel Import"
+msgstr "_ย��ลิ��าร�ำ���า"
+
+#: ../widgets/misc/e-import-assistant.c:908
+msgid "Preview data to be imported"
+msgstr "�ู�ัวอย�า���อมูล�ี��ะ�ำ���า"
+
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1285
+#: ../widgets/misc/e-import-assistant.c:1358
+#: ../widgets/misc/e-import-assistant.c:1368
+msgid "Import Data"
+msgstr "�ำ���า��อมูล"
+
+#: ../widgets/misc/e-import-assistant.c:922
+msgid "Select what type of file you want to import from the list."
+msgstr "�ลือ���ิ��อ����ม�ี��ุ���อ��าร�ำ���า�า�ราย�ื�อ"
+
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Evolution Import Assistant"
 msgstr "��รื�อ�มือ��วย�ำ���า��อมูล�อ� Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1293
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Import Location"
 msgstr "�ำ�ห����ี��ะ�ำ���า"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21362,32 +20743,27 @@ msgstr ""
 "ยิ��ี��อ�รั�สู���รื�อ�มือ��วย�ำ���า��อมูล�อ� Evolution\n"
 "��รื�อ�มือ��วย�ี��ะ�ำ�ุ�สู��ั���อ���า�� �อ��าร�ำ��อมูล�า����มภาย�อ����าสู� Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Importer Type"
 msgstr "��ิ��อ��าร�ำ���า"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1329
 msgid "Select Information to Import"
 msgstr "�ลือ���อมูล�ี��ะ�ห��ำ���า"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1337
 msgid "Select a File"
 msgstr "�ลือ����ม"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1352
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "�� \"�ริ�ม���\" ��ื�อ�ริ�ม�ำ���า���มมายั� Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "�ำ���า��อมูล"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "����ี��ล�"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21407,42 +20783,6 @@ msgstr "Evolution �ำลั�ออ��ล��อยู� ���ุ
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution �ำลั�ออ��ล��อยู� ��ราะ�ม�มี��รือ��าย�ห�����า�"
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "ส�า�ะ�อ��ุ�ม�ือออ��ล��"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "�ำ�ห�����ว�อ�"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "�ำ�ห����อ��ส���ั����อ��มื�อ�ั�วา�����ว�อ�"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "�ำ�ห�����ว�ั��"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "�ำ�ห����อ��ส���ั����อ��มื�อ�ั�วา�����ว�ั��"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "สั�ส�ว�"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "สั�ส�ว���า��อ���อ��ี�สอ�"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "�รั���า�����าย�ัว"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "����า��อ���อ��ี�สอ��ว���ระหว�า��รั���า�"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sync �ั�:"
@@ -21455,7 +20795,7 @@ msgstr "Sync ระ��ีย���อมูลส�ว��ัว:"
 msgid "Sync Categories:"
 msgstr "Sync หมว�:"
 
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "�รั����� Evolution"
 
@@ -21464,68 +20804,46 @@ msgstr "�รั����� Evolution"
 msgid "Matches: %d"
 msgstr "หา��: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "�ิ�������หา"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "_หา:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "ล�า�ราย�าร���หา"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_��อ�ห��า"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "หา�ำ�ห����รา����อ�ห��า�อ�วลี�ี��ำห��"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_�ั���"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "หา�ำ�ห����รา���ั����อ�วลี�ี��ำห��"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "�ัว_�ิม���ห��-�ล���ร��ั�"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "����ายห��า�ล�ว �ริ�มหา�หม��า����"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "�����ห��า�ล�ว �ริ�มหา�หม��า���าย"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "��ว��อร���อร�"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "�อลัม����อร���อร�"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "�าร�รีย�ลำ�ั�"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "�หม��าร�ลือ�"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "�หม��อ���อร���อร�"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "�มื�อ_ล�:"
@@ -21598,43 +20916,46 @@ msgstr "�_มื�อ�สร��สม�ูร��:"
 msgid "When decli_ned:"
 msgstr "�มื�อ_��ิ�ส�:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "_ภาย��"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_หลั��า�:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_หลั��า�"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_��อมูล�ั��หม�"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "�ระ�_ภ�:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_ห��ว��ารส����อ�วาม"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_�ึ��ล�ว"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_�ำห��วั�หม�อายุ"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_���ระ�ั��:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_���ระ�ั��"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "�_มื�อสะ�ว�"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "�มื�อ_��ิ��ล�ว:"
 
@@ -21690,41 +21011,41 @@ msgstr "���มส�ริ�����อ�มีอยู� �ล
 msgid "Click here to go to URL"
 msgstr "�ลิ��ี��ี���ื�อ��ยั� URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "�ั�_ลอ��ี�อยู�ลิ���"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "�ั�ลอ�ลิ������า�ลิ��อร��"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "��ิ�ลิ������_�ราว���อร�"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "��ิ�ลิ������ว����ราว���อร�"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "_�ั�ลอ��ี�อยู�อี�มล"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "�ลือ���ื�อ�วาม�ละรู�ภา��ั��หม�"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "�ลิ���ื�อ�รีย���ยั� %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "�ลิ���ื�อ�ส��/��อ��ี�อยู���า��"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "�ลิ���ื�อ��ิ� %s"
@@ -21743,7 +21064,7 @@ msgstr "��ิ�ิ�: �า� %s �ึ� %s"
 msgid "evolution calendar item"
 msgstr "ราย�าร��ิ�ิ� evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "ราย�ื�อ�ุ��ึ��"
 
@@ -21761,7 +21082,7 @@ msgstr "�ม�มี"
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "�วลา��อ�อยู���รู����: %s"
@@ -21770,48 +21091,12 @@ msgstr "�วลา��อ�อยู���รู����: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "��าร�อยละ�ะ��อ�อยู�����ว��ั����� 0 �ึ� 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "�อลัม���ี��ลือ�"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "�อลัม���ี����ัส"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "�อลัม���ี��ม�����ลือ�"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "�อลัม���ี���า"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "�อลัม���ี��ส�����"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "�อลัม���ัวห�า"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "�อลัม��สี"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "�อลัม��สี�ื��"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "�ลิ���ื�อ��ิ�ม"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "ส�า�ะ"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ห��า��หลั�)"
@@ -21828,12 +21113,12 @@ msgstr "�ม��รีย�"
 msgid "No grouping"
 msgstr "�ม��ั��ลุ�ม"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "�ส�������อมูล"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "�����อมูล�ี�มี"
 
@@ -21842,7 +21127,7 @@ msgid "A_vailable Fields:"
 msgstr "�����อมูล�ี�_มี:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "ห��า��หลั�"
 
@@ -21855,7 +21140,7 @@ msgid "Clear _All"
 msgstr "ล�า��ั��ห_ม�"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "หลั�มาห��า"
 
@@ -21915,7 +21200,7 @@ msgstr "�_ส�������อมูล��อ���ี��า
 msgid "_Sort..."
 msgstr "�_รีย�..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "��ิ�ม�อลัม��"
 
@@ -21927,247 +21212,112 @@ msgstr ""
 "�าร��ิ�ม�อลัม�����ารา� �ำ�����ยลา���วา�\n"
 "�ี��ำ�ห����ี��ุ���อ��าร�ห��ส��"
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d ราย�าร)"
-msgstr[1] "%s : %s (%d ราย�าร)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d ราย�าร)"
+msgstr[1] "%s: %s (%d ราย�าร)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ราย�าร)"
 msgstr[1] "%s (%d ราย�าร)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "สลั�สี�อ���ว"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "�ี�ส���ารา���ว�อ�"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "�ี�ส���ารา���ว�ั��"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "วา����ัส"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "�หม��อ���อร���อร�"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "วิ�ี�าร�ลือ�"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "�ี��ริ�ม�อ��วามยาว"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "�วามสู����า�ั��ุ���ว"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "�������"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "�รั�����มุมมอ��ั��ุ�ั�"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "�รีย��า�ห_��า��หลั�"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "�รีย��า�ห_ลั�มาห��า"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "�_ม��รีย�"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "�ั��ลุ�ม�าม�_����อมูล�ี�"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "�ั��ลุ�ม�าม_�ล�อ�"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "ล�_�อลัม���ี�"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "��ิ�ม�_อลัม��..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "�าร_�ั��ิ��อ�"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "�รั��วาม�ว�า�_�อ�ี"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "�ั�รู�����อ_ลัม��..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "�รั��_���มุมมอ��ั��ุ�ั�..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "�_รีย��าม"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "_�ำห���อ�"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "หัว�ารา�"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "����ำลอ���อมูล�ารา�"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "��ว�อ���อร���อร�"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "��อมูล�อ��าร�รีย�ลำ�ั�"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "���หา�สมอ"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "�ลิ���ื�อ��ิ�ม"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "��อ�����ว�ั��ระหว�า���ว"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "��อ�ว�า���ว�ั��ระหว�า���ว �ึ���ะ��ิม���า�ี���า����ละ��า�ล�า��อ����ละ��ว"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "�ัว�รั��าร��ื�อม��อ�ารา� ETree"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "ห��า�า������า"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "วา��ส���ละ��รื�อ�หมาย +/- สำหรั�ยุ�-�ยาย"
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "��า�ลู�ศรยุ�-�ยาย"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "��า��อ�ลู�ศรยุ�-�ยาย"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ห��า��า��ุ��ึ��"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "�ุ�ห��า��า�ลู�"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "�����"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "�ริ�ม�������อ��ี�"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "สลั���า"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "สลั���า����อ�"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "�ยาย"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "�ยาย��ว�� ETree �ี���อ��ี�อยู�"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "ยุ�"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ยุ������ ETree �ี���อ��ี�อยู�"
 
@@ -22183,118 +21333,1061 @@ msgstr "�ลิ�"
 msgid "sort"
 msgstr "�รีย�ลำ�ั�"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "�ลือ��ั��หม�"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "วิ�ี��อ���อ�วาม"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "�ัว�ั��าร�ห�ุ�าร��"
+#~ msgid "{0}"
+#~ msgstr "{0}"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "��อ�วาม"
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Web Log:"
+#~ msgstr "�ว��ล�อ�:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "�ว�_�ล�อ�:"
+
+#~ msgid "Editable"
+#~ msgstr "��������"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "ห�า"
+#~ msgid "Source Book"
+#~ msgstr "สมุ�����า�"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "�ี���า"
+#~ msgid "Target Book"
+#~ msgstr "สมุ��ลาย�า�"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "สมอยึ�"
+#~ msgid "Is New Contact"
+#~ msgstr "�����ู��ิ���อ�หม�"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "�าร�ั��ิ��อ�"
+#~ msgid "Writable Fields"
+#~ msgstr "�����อมูล�ี���ีย����"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "�วาม�ว�า��อ��ลิ�"
+#~ msgid "Required Fields"
+#~ msgstr "�����อมูล�ั��ั�"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "�วามสู��อ��ลิ�"
+#~ msgid "Changed"
+#~ msgstr "มี�าร��ลี�ย���ล�"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "�ลิ�"
+#~ msgid "Shell"
+#~ msgstr "��ลล�"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "ระ�ายสี�ื���ลิ�"
+#~ msgid "The EShell singleton"
+#~ msgstr "วั��ุ��� (singleton) EShell"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "ออ����� X"
+#~ msgid "Book"
+#~ msgstr "สมุ�"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "ออ����� Y"
+#~ msgid "Is New List"
+#~ msgstr "����ราย�ื�อ�หม�"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "�วาม�ว�า���อ�วาม"
+#~ msgid "Query"
+#~ msgstr "�ำ���"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "�วามสู���อ�วาม"
+#~ msgid "Model"
+#~ msgstr "��อมูล��ร�สร�า�"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "����ุ�����ลา"
+#~ msgid "Shell View"
+#~ msgstr "มุมมอ���ลล�"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "�ุ�����ลา"
+#~ msgid "Source"
+#~ msgstr "�หล��"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "�ั��รร�ั�"
+#~ msgid "Width"
+#~ msgstr "�ว�า�"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "�ั��ี�อั��ระ"
+#~ msgid "Height"
+#~ msgstr "สู�"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "�ำ�ว��รร�ั�สู�สุ�"
+#~ msgid "Has Focus"
+#~ msgstr "มี���ัส"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "วา��อ�"
+#~ msgid "Field"
+#~ msgstr "�����อมูล"
+
+#~ msgid "Field Name"
+#~ msgstr "�ื�อ�����อมูล"
+
+#~ msgid "Text Model"
+#~ msgstr "��อมูล��อ�วาม"
+
+#~ msgid "Max field name length"
+#~ msgstr "�วามยาวสู�สุ��อ��ื�อ�����อมูล"
+
+#~ msgid "Column Width"
+#~ msgstr "�วาม�ว�า��อลัม��"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "��ร�อั��ระ�ึ���รร�ั��หม����"
+#~ msgid "Adapter"
+#~ msgstr "�ัว��ล�"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "วา��ื��หลั�"
+#~ msgid "Selected"
+#~ msgstr "�ลือ�อยู�"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "วา��ุ�ม"
+#~ msgid "Has Cursor"
+#~ msgstr "มี��อร���อร�"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "�ำ�ห�����อร���อร�"
+#~ msgid "Calendar repository is offline."
+#~ msgstr "�หล��������อมูล��ิ�ิ��ม������ื�อม��ออยู�"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM Context"
+#~ msgid "Error on '{0}'"
+#~ msgstr "��ิ���อ�ิ��ลา��ี� '{0}'"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "�ั��ารห��า��า��ุ��ึ��"
+#~ msgid "No response from the server."
+#~ msgstr "�ม�มี�าร�อ�ส�อ��า���ิร���วอร�"
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "�ม�สามาร���ิ���ิ�ิ�"
+
+#~ msgid "{0}."
+#~ msgstr "{0}"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "�ส��สั��าห��ี�����ิ�ิ��ลือ�วั��ี�"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "�ำห��ว�า�ะ�ส��สั��าห��ี���มุมมอ�วั��ละสั��าห��ำ�า�หรือ�ม�"
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "�ส��สั��าห�_�ี���มุมมอ�วั��ละสั��าห��ำ�า�"
+
+#~ msgid "Save"
+#~ msgstr "�ั��ึ�"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "_�ั�หมาย"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "�ู����า_�ระ�ุม..."
+
+#~ msgid "_Task"
+#~ msgstr "_ภาร�ิ�"
+
+#~ msgid "Default Client"
+#~ msgstr "��ร��รมลู���าย�ริยาย"
+
+#~ msgid "Shell Settings"
+#~ msgstr "��า�ั����ลล�"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "��า�ั���ี�มี�ล�ั�ว�ั����ร��รม"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "�ู��_��า�ระ�ุม..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "�ลือ�_วั��ี�"
+
+#~ msgid "_From Field"
+#~ msgstr "��อ�_�า�"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "��อ�/�ส���ัว�ลือ��ู�ส��"
+
+#~ msgid "Show"
+#~ msgstr "�ส��"
+
+#~ msgid "Hide"
+#~ msgstr "��อ�"
+
+#~ msgid "address card"
+#~ msgstr "�าม�ั�ร�ี�อยู�"
+
+#~ msgid "calendar information"
+#~ msgstr "��อมูล��ิ�ิ�"
+
+#~ msgid "Name of the logger"
+#~ msgstr "�ื�อ�อ���รื�อ�มือ�ั��ึ��ูม"
+
+#~ msgid "Filename"
+#~ msgstr "�ื�อ���ม"
+
+#~ msgid "The filename of the module"
+#~ msgstr "�ื�อ���ม�อ��ัวมอ�ูล"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "ระ�ุว�า�ลั��อิ���ิ�����า�อยู�หรือ�ม�"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "�ัว�ิ��าม���ัส"
+
+#~ msgid "Shell Module"
+#~ msgstr "มอ�ูล��ลล�"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "�����อ�����ลล��อ��มล"
+
+#~ msgid "Show Deleted"
+#~ msgstr "�ส���ี�ล����ล�ว"
+
+#~ msgid "To Do"
+#~ msgstr "�ะ�ำ"
+
+#~ msgid "Later"
+#~ msgstr "�ว��ีหลั�"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "�ม�สามาร�สร�า���ล��อร��หม� `%s': %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "�ม�สามาร��ั�ลอ���ล��อร� `%s' ��ยั� `%s': %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "�ม�สามาร��รว�หา�ล�อ��มล�ี�มีอยู��ี� `%s': %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ำ�ห����ละ��ร�สร�า��อ���ล��อร��ล�อ��มล�อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
+#~ "\n"
+#~ "�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "�ม�สามาร���ิ���อมูล POP ���า `%s' ��ิ������ว��ี���ิร���วอร�: %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "�ม�สามาร�สร�า����ร��อรี��อมูล POP3 `%s' ��ิ������ว��ี���ิร���วอร�: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "�ม�สามาร��ั�ลอ���อมูล POP3 `%s' ��ิ������ว��ี���ิร���วอร�: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "�ม�สามาร�สร�า��ี������มล����รื�อ� `%s': %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "�ม�สามาร�อ�า���า�ั���า��าร�ิ��ั���รั����อ��อ� Evolution �ม�มี���ม `evolution/config."
+#~ "xmldb' หรือ���ม�สียหาย"
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "�ห� Evolution �ส���า�ส�ว��อ���อ�วาม����า��ำ�ั����"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "��ิ������ื�อ�ส���า�ส�ว��อ���อ�วาม����า��ี��ำ�ั�"
+
+#~ msgid "Show \"From\" field when sending a mail message"
+#~ msgstr "�ส����อ� \"�า�\" �มื�อส���มล"
+
+#~ msgid ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+#~ msgstr ""
+#~ "�ส����อ� \"�า�\" �มื�อส���มล �ึ���ะ�ว��ุม�า��ม�ู \"มุมมอ�\" �มื�อมี�าร�ลือ��ั��ี�มล"
+
+#~ msgid "Text message part limit"
+#~ msgstr "��า�ส�ว��อ���อ�วามสู�สุ�"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<p>�ัว�ลือ��าร�อ��ั�����มล</b> (�ม��อ��ะ�ำ)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "��ราะ \"{0}\""
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "��ราะ \"{2}\""
+
+#~ msgid "Do not d_elete"
+#~ msgstr "�_ม�ล�"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "��ล��อร����หา��อ���ี�:\n"
+#~ "{0}\n"
+#~ "�����ล��อร���อ���ี� �ึ���ู�ล����ล�ว:\n"
+#~ "    \"{1}\"\n"
+#~ "�ละ����รั���อมูล�หม��ล�ว"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "���าร�รอ���อ���ี�:\n"
+#~ "{0}\n"
+#~ "�����ล��อร���อ���ี� �ึ���ู�ล����ล�ว:\n"
+#~ "    \"{1}\"\n"
+#~ "�ละ����รั���อมูล�หม��ล�ว"
+
+#~ msgid "Shell Backend"
+#~ msgstr "�����อ�����ลล�"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "��ล��อร��ี�มี�����อ�วาม��อ� �รุ�า����ม�ู \"มุมมอ�\"->\"�ส����อ�วาม�ี���อ��ว�\" "
+#~ "��ื�อสั���ส����อ�วาม�ั��ล�าว"
+
+#~ msgid "Table column:"
+#~ msgstr "�อลัม���ารา�:"
+
+#~ msgid "Source List"
+#~ msgstr "ราย�ื�อ�หล��"
+
+#~ msgid "The registry of address books"
+#~ msgstr "�ะ��ีย��อ�สมุ��ี�อยู�"
+
+#~ msgid "Current View"
+#~ msgstr "มุมมอ��ั��ุ�ั�"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "มุมมอ��ี��ลือ����ั��ุ�ั��อ�สมุ��ี�อยู�"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "�ู��ิ���อ�ี��ำลั��ส���ัวอย�า�"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "�ู��ิ���อ�ี��ำลั��ส��อยู�����อ��ส���ัวอย�า�"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "��อ��ส���ัวอย�า��รา��อยู�"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "�ำห��ว�า����ส����อ��ส���ัวอย�า�อยู�หรือ�ม�"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "��ิร���วอร� LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "�าร�ั����า�าร��ิม���ม�ำอั���มั�ิ"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ำ�ห����ละ��ร�สร�า��อ���ล��อร��ู��ิ���อ�อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
+#~ "\n"
+#~ "�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "รู�����อ��าร�ิ���อ�มลลิ�ลิส��มี�าร��ลี�ย���ล�\n"
+#~ "\n"
+#~ "�รุ�ารอ ����ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "วิ�ี����หมาย�ล���รศั����อ� Evolution �����ลี�ย����ล�ว\n"
+#~ "\n"
+#~ "�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "�ั��ึ��าร��ลี�ย���ล��อ��าร sync palm �อ� Evolution �����ลี�ย����ล�ว\n"
+#~ "\n"
+#~ "�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��อมูล�าร sync pilot �อ��ุ�..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "วิ������ลือ��หล��"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "วิ������ี��ส���ลุ�ม��า�� �อ�สมุ��ี�อยู�"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "�ั��ึ����� vCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "�ะ��ีย��อ���ิ�ิ�"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ำ�ห����ละ��ร�สร�า��อ���ล��อร���ิ�ิ��อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
+#~ "\n"
+#~ "�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "�ม�สามาร�ย�าย��อมูล�าร�ั����า���า�า� evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "�ม�สามาร�ย�าย��อมูล��ิ�ิ� `%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "วิ�������อ��ู��ิ�ิ�"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "วิ������ี��ะ�ส����ิ�ิ���า��ล��"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "��ร��รมลู���าย��ิ�ิ��ริยาย"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "��ร��รมลู���าย�ริยายสำหรั��าร�ระ�ำ��า�� �ั���ิ�ิ�"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "วิ������ี��ะ�ส���ลุ�ม��า�� �อ���ิ�ิ�"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "�ะ��ีย��อ�ราย�าร�ั��ึ���วย�ำ"
+
+#~ msgid "The memo table model"
+#~ msgstr "����ำลอ���อมูล�ารา��อ��ั��ึ���วย�ำ"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "��ร��รมอ�า�-��ีย��ั��ึ���วย�ำ�ริยาย"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "��ร��รม�ริยายสำหรั��าร�ระ�ำ��า�� �ั��ั��ึ���วย�ำ"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "วิ������ี��ะ�ส���ลุ�ม��า�� �อ�ราย�าร�ั��ึ���วย�ำ"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "�ะ��ีย�ราย�ารภาร�ิ�"
+
+#~ msgid "The task table model"
+#~ msgstr "����ำลอ���อมูล�ารา�ภาร�ิ�"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ำ�ห����ละ��ร�สร�า��อ���ล��อร�ภาร�ิ��อ� Evolution มี�าร��ลี�ย���ล��า�รุ�� 1.x\n"
+#~ "\n"
+#~ "�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "�ม�สามาร�ย�าย��อมูลภาร�ิ� `%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "��ร��รม�ั��ารภาร�ิ��ริยาย"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "��ร��รม�ริยายสำหรั��าร�ระ�ำ��า�� �ั�ภาร�ิ�"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "วิ������ี��ส���ลุ�ม��า�� �อ�ราย�ารภาร�ิ�"
+
+#~ msgid "Group by Threads"
+#~ msgstr "�ั��ลุ�ม�าม�ระ�ู�"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "�ำห��ว�า�ะ�ั��ลุ�ม��อ�วาม�าม�ระ�ู�หรือ�ม�"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "��อ���อ�วาม�ี�_อ�า��ล�ว"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "��อ���อ�วาม�ั��หม��ี����อ�า��ล�ว�ว��ั�ว�ราว"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "��อ���อ�วาม�ี��_ลือ�"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "��อ���อ�วาม�ี��ลือ��ั�ว�ราว"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "�ส_����อ�วาม�ี���อ��ว�"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "�ส����อ�วาม�ี������อ��ว��ั�ว�ราว"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "_��อ���อ�วาม�ี�ล�"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "��อ���อ�วาม�ี�ล� ����าร�ส����วย�าร�ี���า"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "ราย�าร��าะ�ส�ี��ลั��อิ���ือ��าร������ม�ะ���หา����ื�อ�วาม"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr "�รว�สอ���ะ�ริ�ม��ร��รม ว�า Evolution ������ร��รมอ�า�-��ีย��มล�ริยายหรือ�ม�"
+
+#~ msgid "Default Mail Client"
+#~ msgstr "��ร��รมอ�า�-��ีย��มล�ริยาย"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>��ิร���วอร�</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>�ู����:</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>�ื�อ�ั��ี</b>"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "��ิ�ม�ารรอ�รั� Hula �ห��ั� Evolution"
+
+#~ msgid "Hula Support"
+#~ msgstr "�ารรอ�รั� Hula"
+
+#~ msgid "_Accept"
+#~ msgstr "�อ�_รั�"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "�ำ�ุ�สู��าร�ั����า�ั��ี�ริ�ม�ร�"
+
+#~ msgid "Setup Assistant"
+#~ msgstr "�ู���วย�ั����า"
+
+#~ msgid "Importing data."
+#~ msgstr "�ำลั��ำ���า��อมูล"
+
+#~ msgid "Please wait"
+#~ msgstr "�รุ�ารอสั��รู�"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "รู���������รื�อ�มือ"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "รู�����อ������รื�อ�มือ�อ��ัวสลั�"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "�ส�������รื�อ�มือ"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "�ำห��ว�า�ะ�ส���ัวสลั�หรือ�ม�"
+
+#~ msgid "Switcher Action"
+#~ msgstr "�าร�ระ�ำ�อ��ัวสลั�"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "�าร�ระ�ำ�อ��ัวสลั�สำหรั�มุมมอ���ลล��ี�"
+
+#~ msgid "Page Number"
+#~ msgstr "หมาย�ล�ห��า"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "หมาย�ล�ห��าสมุ��อ�มุมมอ���ลล�"
+
+#~ msgid "Search Rule"
+#~ msgstr "���าร���หา"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "��ื�อ���สำหรั��ล�าร���หา�ั��ุ�ั�"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "EShellBackend สำหรั�มุมมอ���ลล��ี�"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "วิ�������ื�อหา��ลล�"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "วิ�������ื�อหา�ะ�รา������อ���า��วา�อ�ห��า��า���ลล�"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "วิ����������า��อ���ลล�"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "วิ����������า��ะ�รา������อ���า���าย�อ�ห��า��า���ลล�"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "วิ���������า��อ���ลล�"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "วิ���������า��ะ�รา���ี���า�ล�า��อ�ห��า��า���ลล�"
+
+#~ msgid "Shell Window"
+#~ msgstr "ห��า��า���ลล�"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "ห��า��า��ี��������า�อ�มุมมอ���ลล��ี�"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "���ม�ีย��ึ��������อมูลส�า�ะ�อ�วิ�����"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "�ื�อ�อ�มุมมอ���ลล��ี�"
+
+#~ msgid "Current View ID"
+#~ msgstr "ID �อ�มุมมอ��ั��ุ�ั�"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "ID �อ�มุมมอ� GAL �ั��ุ�ั�"
+
+#~ msgid "Active Shell View"
+#~ msgstr "มุมมอ���ลล��ี��ำ�า�อยู�"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "�ื�อ�อ�มุมมอ���ลล��ี��ำ�า�อยู�"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "EFocusTracker �อ�ห��า��า���ลล�"
+
+#~ msgid "Geometry"
+#~ msgstr "�ร�า��ิ�"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "��อ�ำห���ร�า��ิ��ริ�ม�ร��อ�ห��า��า�"
+
+#~ msgid "Safe Mode"
+#~ msgstr "�หม��ลอ�ภัย"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "ระ�ุว�าห��า��า���ลล�อยู����หม��ลอ�ภัยหรือ�ม�"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "�ส�������า�"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "�ำห��ว�า�ะ�ส�������า���ห��า��า���ลล�หรือ�ม�"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "�ส���ัวสลั�"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "�ำห��ว�า�ะ�ส���ุ�ม��า�� �อ��ัวสลั���ห��า��า���ลล�หรือ�ม�"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "�ส������า�"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "�ำห��ว�า�ะ�ส������า��อ�ห��า��า���ลล�หรือ�ม�"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "�ำห��ว�า�ะ�ส�������รื�อ�มือ�อ�ห��า��า���ลล�หรือ�ม�"
+
+#~ msgid "UI Manager"
+#~ msgstr "�ู��ั��าร UI"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "GtkUIManager �อ�ห��า��า���ลล�"
+
+#~ msgid "Module Directory"
+#~ msgstr "���ร��อรีสำหรั�มอ�ูล"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "���ร��อรี�ี��ะ����หล� EModule ��า��"
+
+#~ msgid "Network Available"
+#~ msgstr "มี��รือ��าย�ห�����า����"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "ระ�ุว�ามี��รือ��าย�ห�����า����หรือ�ม�"
+
+#~ msgid "Online"
+#~ msgstr "ออ��ล��"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "ระ�ุว�า��ลล�ออ��ล��อยู�หรือ�ม�"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "�ั��ั��รั�รุ����อมูล�หม��า� Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "�ี�ว�า����ิส���ม���ีย��อสำหรั��าร�รั�����รุ���หม�"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "ล���อมูล���า�ริ�หรือ�ม�?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "��ื�อหา�ั��หม��อ����ร��อรี &quot;evolution&quot; �ำลั��ะ�ู�ล��ิ��อย�า��าวร\n"
+#~ "\n"
+#~ "�อ��ะ�ำว�า �ุ��วร�รว�สอ��ห�������สีย��อ� ว�า��อมูล�มล �ู��ิ���อ "
+#~ "�ละ��ิ�ิ��อ��ุ�ยั�อยู��ร��ั��หม� �ละ Evolution รุ���ี��ำ�า�อย�า��ู���อ� "
+#~ "��อ��ี��ะล���อมูล���า�หล�า�ี�\n"
+#~ "\n"
+#~ "�มื�อล��ล�ว �ุ��ะ�ม�สามาร��รั�รุ���อ� Evolution �ลั�ล�มา����รุ�����า��ยอั���มั�ิ "
+#~ "��ย�ม���อ���ล�สิ����า�� ��วย�ัว�อ����อี���อ��\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "Evolution รุ����อ�������อมูล�ว���ละ�ห��\n"
+#~ "\n"
+#~ "��า�ุ��ลือ��ี��ะล���อมูล�ุ��ี� ��ื�อหา�ั��หม��อ����ร��อรี &quot;evolution&quot; "
+#~ "�ะ�ู�ล��ิ��อย�า��าวร ��า�ุ��ลือ��ี��ะ������อมูล�ุ��ี��ว� �ุ�ยั�สามาร�ล����ร��อรี &quot;"
+#~ "evolution&quot; ��วย�ัว�อ���ภายหลั�����ามสะ�ว�\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "�าร�รั���อมูล�ละ��า�ั������รุ���หม� �ะ��อ��าร��ื�อ�ี��ิส�� {0} ����ุ�มี��ื�อ�ี�ว�า�อยู���ีย� {1}\n"
+#~ "\n"
+#~ "�ุ��ำ������อ�หา��ื�อ�ี�ว�า�มา��ว�า�ี������ร��อรี��า��อ��ุ� ��อ��ี��ะ�ำ��ิ��าร��อ��"
+
+#~ msgid "_Keep Data"
+#~ msgstr "�_�����อมูล�ว�"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "�_�ือ�อี��ราวห��า"
+
+#~ msgid "Edit"
+#~ msgstr "�����"
+
+#~ msgid "Import"
+#~ msgstr "�ำ���า"
+
+#~ msgid "View"
+#~ msgstr "�ู"
+
+#~ msgid "Collection"
+#~ msgstr "�ุ���อมูล"
+
+#~ msgid "Instance"
+#~ msgstr "วั��ุ"
+
+#~ msgid "Factory"
+#~ msgstr "�ร��า�"
+
+#~ msgid "Action"
+#~ msgstr "��ิ�ั�ิ�าร"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "อ�อ������ GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "�ส���_�����ม���"
+
+#~ msgid "Fill color"
+#~ msgstr "สี��ิม"
+
+#~ msgid "GDK fill color"
+#~ msgstr "สี��ิม�อ� GDK"
+
+#~ msgid "Fill stipple"
+#~ msgstr "ลาย�ี�ระ�าย"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "�วาม�ว�า���ำสุ�"
+
+#~ msgid "Minimum Width"
+#~ msgstr "�วาม�ว�า���ำสุ�"
+
+#~ msgid "Spacing"
+#~ msgstr "�าร�ว����อ�ว�า�"
+
+#~ msgid "The button state is online"
+#~ msgstr "ส�า�ะ�อ��ุ�ม�ือออ��ล��"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "�ำ�ห�����ว�อ�"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "�ำ�ห����อ��ส���ั����อ��มื�อ�ั�วา�����ว�อ�"
+
+#~ msgid "Vertical Position"
+#~ msgstr "�ำ�ห�����ว�ั��"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "�ำ�ห����อ��ส���ั����อ��มื�อ�ั�วา�����ว�ั��"
+
+#~ msgid "Proportion"
+#~ msgstr "สั�ส�ว�"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "สั�ส�ว���า��อ���อ��ี�สอ�"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "�รั���า�����าย�ัว"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "����า��อ���อ��ี�สอ��ว���ระหว�า��รั���า�"
+
+#~ msgid "Cursor Row"
+#~ msgstr "��ว��อร���อร�"
+
+#~ msgid "Cursor Column"
+#~ msgstr "�อลัม����อร���อร�"
+
+#~ msgid "Sorter"
+#~ msgstr "�าร�รีย�ลำ�ั�"
+
+#~ msgid "Selection Mode"
+#~ msgstr "�หม��าร�ลือ�"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "�หม��อ���อร���อร�"
+
+#~ msgid "Selected Column"
+#~ msgstr "�อลัม���ี��ลือ�"
+
+#~ msgid "Focused Column"
+#~ msgstr "�อลัม���ี����ัส"
+
+#~ msgid "Unselected Column"
+#~ msgstr "�อลัม���ี��ม�����ลือ�"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "�อลัม���ี���า"
+
+#~ msgid "Underline Column"
+#~ msgstr "�อลัม���ี��ส�����"
+
+#~ msgid "Bold Column"
+#~ msgstr "�อลัม���ัวห�า"
+
+#~ msgid "Color Column"
+#~ msgstr "�อลัม��สี"
+
+#~ msgid "BG Color Column"
+#~ msgstr "�อลัม��สี�ื��"
+
+#~ msgid "State"
+#~ msgstr "ส�า�ะ"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "สลั�สี�อ���ว"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "�ี�ส���ารา���ว�อ�"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "�ี�ส���ารา���ว�ั��"
+
+#~ msgid "Draw focus"
+#~ msgstr "วา����ัส"
+
+#~ msgid "Cursor mode"
+#~ msgstr "�หม��อ���อร���อร�"
+
+#~ msgid "Selection model"
+#~ msgstr "วิ�ี�าร�ลือ�"
+
+#~ msgid "Length Threshold"
+#~ msgstr "�ี��ริ�ม�อ��วามยาว"
+
+#~ msgid "Uniform row height"
+#~ msgstr "�วามสู����า�ั��ุ���ว"
+
+#~ msgid "Frozen"
+#~ msgstr "�������"
+
+#~ msgid "Table header"
+#~ msgstr "หัว�ารา�"
+
+#~ msgid "Table model"
+#~ msgstr "����ำลอ���อมูล�ารา�"
+
+#~ msgid "Cursor row"
+#~ msgstr "��ว�อ���อร���อร�"
+
+#~ msgid "Sort Info"
+#~ msgstr "��อมูล�อ��าร�รีย�ลำ�ั�"
+
+#~ msgid "Always search"
+#~ msgstr "���หา�สมอ"
+
+#~ msgid "Use click to add"
+#~ msgstr "�ลิ���ื�อ��ิ�ม"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "��อ�����ว�ั��ระหว�า���ว"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "��อ�ว�า���ว�ั��ระหว�า���ว �ึ���ะ��ิม���า�ี���า����ละ��า�ล�า��อ����ละ��ว"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "�ัว�รั��าร��ื�อม��อ�ารา� ETree"
+
+#~ msgid "Retro Look"
+#~ msgstr "ห��า�า������า"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "วา��ส���ละ��รื�อ�หมาย +/- สำหรั�ยุ�-�ยาย"
+
+#~ msgid "Expander Size"
+#~ msgstr "��า�ลู�ศรยุ�-�ยาย"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "��า��อ�ลู�ศรยุ�-�ยาย"
+
+#~ msgid "popup"
+#~ msgstr "ห��า��า��ุ��ึ��"
+
+#~ msgid "edit"
+#~ msgstr "�����"
+
+#~ msgid "toggle"
+#~ msgstr "สลั���า"
+
+#~ msgid "expand"
+#~ msgstr "�ยาย"
+
+#~ msgid "Event Processor"
+#~ msgstr "�ัว�ั��าร�ห�ุ�าร��"
+
+#~ msgid "Text"
+#~ msgstr "��อ�วาม"
+
+#~ msgid "Bold"
+#~ msgstr "ห�า"
+
+#~ msgid "Strikeout"
+#~ msgstr "�ี���า"
+
+#~ msgid "Anchor"
+#~ msgstr "สมอยึ�"
+
+#~ msgid "Justification"
+#~ msgstr "�าร�ั��ิ��อ�"
+
+#~ msgid "Clip Width"
+#~ msgstr "�วาม�ว�า��อ��ลิ�"
+
+#~ msgid "Clip Height"
+#~ msgstr "�วามสู��อ��ลิ�"
+
+#~ msgid "Clip"
+#~ msgstr "�ลิ�"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "ระ�ายสี�ื���ลิ�"
+
+#~ msgid "X Offset"
+#~ msgstr "ออ����� X"
+
+#~ msgid "Y Offset"
+#~ msgstr "ออ����� Y"
+
+#~ msgid "Text width"
+#~ msgstr "�วาม�ว�า���อ�วาม"
+
+#~ msgid "Text height"
+#~ msgstr "�วามสู���อ�วาม"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "����ุ�����ลา"
+
+#~ msgid "Ellipsis"
+#~ msgstr "�ุ�����ลา"
+
+#~ msgid "Line wrap"
+#~ msgstr "�ั��รร�ั�"
+
+#~ msgid "Break characters"
+#~ msgstr "�ั��ี�อั��ระ"
+
+#~ msgid "Max lines"
+#~ msgstr "�ำ�ว��รร�ั�สู�สุ�"
+
+#~ msgid "Draw borders"
+#~ msgstr "วา��อ�"
+
+#~ msgid "Allow newlines"
+#~ msgstr "��ร�อั��ระ�ึ���รร�ั��หม����"
+
+#~ msgid "Draw background"
+#~ msgstr "วา��ื��หลั�"
+
+#~ msgid "Draw button"
+#~ msgstr "วา��ุ�ม"
+
+#~ msgid "Cursor position"
+#~ msgstr "�ำ�ห�����อร���อร�"
+
+#~ msgid "IM Context"
+#~ msgstr "IM Context"
+
+#~ msgid "Handle Popup"
+#~ msgstr "�ั��ารห��า��า��ุ��ึ��"
 
 #~ msgid "search bar"
 #~ msgstr "������หา"
@@ -23331,9 +23424,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Orientation"
 #~ msgstr "��ววา�"
 
-#~ msgid "Page"
-#~ msgstr "ห��า"
-
 #~ msgid "Page Setup:"
 #~ msgstr "�ั����าห��า�ระ�าษ:"
 
@@ -24095,7 +24185,7 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgstr "<span weight=\"bold\">ลาย�����ิ�ิ�ัล</span>"
 
 #~ msgid "<span weight=\"bold\">Encryption</span>"
-#~ msgstr "<span weight=\"bold\">�าร���ารหัส</span>"
+#~ msgstr "<span weight=\"bold\">�าร���ารหัสลั�</span>"
 
 #~ msgid "Case _sensitive"
 #~ msgstr "�ัว�ิม���ห��-�_ล���ร��ั�"
@@ -24152,7 +24242,7 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgstr "�หล����ิ�ิ� CalDAV"
 
 #~ msgid "Provides core functionality for local calendars."
-#~ msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ���อ��ิ��"
+#~ msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ�����รื�อ�"
 
 #~ msgid "HTTP Calendars"
 #~ msgstr "��ิ�ิ� HTTP"
@@ -24318,16 +24408,16 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ "behalf."
 #~ msgstr ""
 #~ "��อ�วาม�ี��ู�ส����ยอั���มั�ิ�า� Evolution ��ื�อ�����ห��ุ��รา�ว�า�ุ����รั��ารมอ��ั��ะ�ล�ว "
-#~ "��อ���ี� �ุ�สามาร�ส����อ�วาม���าม�อ���า����า���"
+#~ "��อ���ี� �ุ�สามาร�ส����อ�วาม���าม�อ��ั����"
 
 #~ msgid "You have been given the following permissions on my folders:"
-#~ msgstr "�ุ����รั�อ�ุ�า��ห��ระ�ำ�าร��อ���ี�����ล��อร��อ���า����า:"
+#~ msgstr "�ุ����รั�อ�ุ�า��ห��ระ�ำ�าร��อ���ี�����ล��อร��อ��ั�:"
 
 #~ msgid "You are also permitted to see my private items."
-#~ msgstr "�ุ����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ���า����า�����วย"
+#~ msgstr "�ุ����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ��ั������วย"
 
 #~ msgid "However you are not permitted to see my private items."
-#~ msgstr "����ุ��ม����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ���า����า"
+#~ msgstr "����ุ��ม����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ��ั�"
 
 #~ msgid "You have been designated as a delegate for %s"
 #~ msgstr "�ุ����รั��ารมอ��ั��ะ�ห������ัว����อ� %s"
@@ -24888,9 +24978,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Import ICS"
 #~ msgstr "�ำ���า ICS"
 
-#~ msgid "_Import"
-#~ msgstr "�ำ�_��า"
-
 #~ msgid "Imports ICS attachments to calendar."
 #~ msgstr "�ำ���า���ม������ ICS ล�����ิ�ิ�"
 
@@ -25350,9 +25437,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "_Hide Buttons"
 #~ msgstr "��อ_��ุ�ม"
 
-#~ msgid "_Quit"
-#~ msgstr "_ออ�"
-
 #~ msgid "_Synchronization Options..."
 #~ msgstr "_�ัว�ลือ��าร sync..."
 
@@ -25634,9 +25718,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ "�ละ��ื�อ����มา�ร�าร��อ��ั� ��อ��ส���ัวอย�า���อ�วาม��า�� �ะ�ู���อ��ั��หม�\n"
 #~ "�ุ�สามาร��รีย���อ��ส���ัวอย�า��ั��ล�าว�ื�มา��� ��ย����ม�ูมุมมอ�\n"
 
-#~ msgid "_Do not show this message again"
-#~ msgstr "�_ม���อ��ส����อ�วาม�ี�อี�"
-
 #~ msgid "Permission Denied."
 #~ msgstr "�ม����รั�อ�ุ�า�"
 
@@ -25776,13 +25857,13 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgstr "��ิ����ม"
 
 #~ msgid "PGP Encrypt"
-#~ msgstr "���ารหัส PGP"
+#~ msgstr "���ารหัสลั� PGP"
 
 #~ msgid "PGP Sign"
 #~ msgstr "���� PGP"
 
 #~ msgid "S/MIME Encrypt"
-#~ msgstr "���ารหัส S/MIME"
+#~ msgstr "���ารหัสลั� S/MIME"
 
 #~ msgid "S/MIME Sign"
 #~ msgstr "���� S/MIME"
@@ -26099,9 +26180,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Calendar Group"
 #~ msgstr "�ลุ�ม��ิ�ิ�"
 
-#~ msgid "Calendar Name"
-#~ msgstr "�ื�อ��ิ�ิ�"
-
 #~ msgid "<b>Task List Options</b>"
 #~ msgstr "<b>�ัว�ลือ�ราย�ารภาร�ิ�</b>"
 
@@ -26388,9 +26466,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "_Subscribe"
 #~ msgstr "_�อ�รั���อมูล"
 
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "�ำ��รื�อ�หมายว�า�ุ���อ�วามอ�า��ล�ว����ล��อร��ี��ลือ�"
-
 #~ msgid "C_lassification"
 #~ msgstr "_�ระ�ภ�"