[evolution/foocanvas] Updated Thai translation.

[Henning Habighorst <hhabig src gnome org>]

commit 5ce8db6c754790aeb0bf488ba80efd230280408f
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Mon Apr 19 19:45:59 2010 +0700

    Updated Thai translation.

 po/th.po |25727 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 13708 insertions(+), 12019 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index df57d99..9269ab4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,21 +1,22 @@
 # translation of evolution to Thai
 # This file is distributed under the same license as the evolution package.
-# Copyright (C) 2005-2009 Free Software Foundation, Inc.
+# Copyright (C) 2005-2010 Free Software Foundation, Inc.
 # Supranee Thirawatthanasuk <supranee opentle org>, 2005.
-# Theppitak Karoonboonyanan <thep linux thai net>, 2005-2009.
+# Theppitak Karoonboonyanan <thep linux thai net>, 2005-2010.
 #
 # TRANSLATORS NOTE:
 # Thai has no plural form. But we set nplurals=2 here because of some
 # messages like "Every day" and "Every %d days", which will sound better
 # if translated differently.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:479
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-13 10:16+0700\n"
-"PO-Revision-Date: 2009-05-23 23:23+0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2010-04-15 23:15+0000\n"
+"PO-Revision-Date: 2010-04-19 19:43+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -23,322 +24,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution address book"
-msgstr "สมุ��ี�อยู� evolution"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "New Contact"
-msgstr "�ี�อยู��ิ���อ�หม�"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "New Contact List"
-msgstr "ราย�ื�อ�ี�อยู��ิ���อ�หม�"
-
-#: ../a11y/addressbook/ea-minicard-view.c:162
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "��ล��อร�สมุ��ี�อยู� %s มี�าม�ั�ร %d ��"
-msgstr[1] "��ล��อร�สมุ��ี�อยู� %s มี�าม�ั�ร %d ��"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "��ิ�"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "ราย�ื�อ�ี�อยู��ิ���อ: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "�ี�อยู��ิ���อ: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "minicard �อ� evolution"
-
-#: ../a11y/calendar/ea-cal-view-event.c:265
-msgid "It has alarms."
-msgstr "มี�าร��ือ�"
-
-#: ../a11y/calendar/ea-cal-view-event.c:268
-msgid "It has recurrences."
-msgstr "มี�าร�วีย���ำ"
-
-#: ../a11y/calendar/ea-cal-view-event.c:271
-msgid "It is a meeting."
-msgstr "�ือ�าร�ระ�ุม"
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "��ิ�ิ��ห�ุ�าร��: สรุ��ือ %s"
-
-#: ../a11y/calendar/ea-cal-view-event.c:279
-msgid "Calendar Event: It has no summary."
-msgstr "��ิ�ิ��ห�ุ�าร��: �ม�มีราย�ารสรุ�"
-
-#: ../a11y/calendar/ea-cal-view-event.c:299
-msgid "calendar view event"
-msgstr "�ห�ุ�าร���าร�ู��ิ�ิ�"
-
-#: ../a11y/calendar/ea-cal-view-event.c:527
-msgid "Grab Focus"
-msgstr "ยึ����ัส"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "�ั�หมาย�หม�"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "�ห�ุ�าร���ลอ��ั��วั��หม�"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "�ระ�ุม�หม�"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "���ี�วั��ี�"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "��ยั�วั��ี�"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
-msgid "a table to view and select the current time range"
-msgstr "�ารา���ื�อ�ู�ละ�ลือ���ว�ระยะ�วลา � �ั��ุ�ั�"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "มี %d �ห�ุ�าร��"
-msgstr[1] "มี %d �ห�ุ�าร��"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "�ม�มี�ห�ุ�าร��"
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "รายสั��าห��ำ�า�: %s, %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "รายวั�: %s, %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "มุมมอ�สำหรั�ห�ึ��สั��าห��ำ�า�"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "มุมมอ���ิ�ิ�สำหรั�วั���ียวหรือหลายวั�"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Ey"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Ey"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
-msgid "%d %b %Y"
-msgstr "%d %b %Ey"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
-msgid "Gnome Calendar"
-msgstr "��ิ�ิ� Gnome"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "������หา"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "������หา��ิ�ิ� evolution"
-
-#: ../a11y/calendar/ea-jump-button.c:147
-msgid "Jump button"
-msgstr "�ุ�ม�ระ���"
-
-#: ../a11y/calendar/ea-jump-button.c:156
-msgid "Click here, you can find more events."
-msgstr "�ุ�สามาร��ู�ห�ุ�าร��มา��ว�า�ี� ��ย�ลิ��ี��ี�"
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "ราย��ือ�: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "รายสั��าห�: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "��ิ�ิ�สำหรั�ห�ึ����ือ�"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "��ิ�ิ��ูภาย�� 1 สั��าห� หรือมา��ว�า"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ห��า��า��ุ��ึ��"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "�ุ�ห��า��า�ลู�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
-msgid "edit"
-msgstr "�����"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
-msgid "begin editing this cell"
-msgstr "�ริ�ม�������อ��ี�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
-msgid "toggle"
-msgstr "สลั���า"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
-msgid "toggle the cell"
-msgstr "สลั���า����อ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "�ยาย"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "�ยาย��ว�� ETree �ี���อ��ี�อยู�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "ยุ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "ยุ������ ETree �ี���อ��ี�อยู�"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
-msgid "Table Cell"
-msgstr "��อ��ารา�"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
-msgid "click to add"
-msgstr "�ลิ���ื�อ��ิ�ม"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
-msgid "click"
-msgstr "�ลิ�"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "�รีย�ลำ�ั�"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d %B %Ey"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "��ิ�ิ�: �า� %s �ึ� %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "ราย�าร��ิ�ิ� evolution"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "�ุ�ม�อม��"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "�����า�ริยาย"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "�ม�ู����ุ��ึ��"
-
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "��อ�/�ส��������ม���"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "��ิ����"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -346,13 +31,13 @@ msgid ""
 "different address book from the side bar in the Contacts view."
 msgstr ""
 "'{0}' ����สมุ��ี�อยู��ี�อ�า����อย�า���ียว ������ม���� �รุ�า�ลือ�สมุ��ี�อยู�อื���า������า���มุมมอ� "
-"\"�ี�อยู��ิ���อ\""
+"\"�ู��ิ���อ\""
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
-msgstr "�ี�อยู��ิ���อ�ี�มีอยู��ล�ว �ุ�ยั���อ��าร��ิ�ม�ั�ร�หม���วย�ี�อยู���ียว�ั��ี�อี�หรือ�ม�?"
+msgstr "�ู��ิ���อ�ี�มีอยู��ล�ว �ุ�ยั���อ��าร��ิ�ม�ั�ร�หม���วย�ี�อยู���ียว�ั��ี�อี�หรือ�ม�?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -360,11 +45,11 @@ msgstr "�ี�อยู�  '{0}' �ี�มีอยู��ล�ว"
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
-msgstr "�ม�สามาร���ิ�ม�ี�อยู��ิ���อ�หม�"
+msgstr "�ม�สามาร���ิ�ม�ู��ิ���อ�หม�"
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
-msgstr "�ม�สามาร�ย�าย�ี�อยู��ิ���อ"
+msgstr "�ม�สามาร�ย�าย�ู��ิ���อ"
 
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
@@ -389,63 +74,54 @@ msgstr "�ม�สามาร�ล�สมุ��ี�อยู�"
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "��ะ�ี� Evolution สามาร����า���สมุ��ี�อยู��อ�ระ�����า�ั��สำหรั� GroupWise "
 "�รุ�า�����ร��รมอ�า��มล�อ� GroupWise ��ร��รมอื���รั��ห�ึ����อ� "
-"��ื�อ�ห������ล��อร��ี�อยู��ิ���อ�ี������อย �ละ�ี�อยู��ิ���อส�ว��ัว�า� GroupWise"
+"��ื�อ�ห������ล��อร��ู��ิ���อ�ี������อย �ละ�ู��ิ���อส�ว��ัว�า� GroupWise"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "ล�สมุ��ี�อยู� '{0}' หรือ�ม�?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "��ิ���อ�ิ��ลา���ะ�หล�สมุ��ี�อยู�"
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "��ิ���อ�ิ��ลา���ะ�ั��ึ� {0} ��ยั� {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "�รว�สอ�สิ��ิ���วย��ิร���วอร� LDAP ล�ม�หลว"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
-msgstr "�ม�สามาร�ล��ี�อยู��ิ���อ"
+msgstr "�ม�สามาร�ล��ู��ิ���อ"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "�ารสร�า�สมุ��ี�อยู��อ� GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "��ิร���วอร� LDAP �ม��อ�ส�อ��ั���อมูล schema �ี��ู���อ�"
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "รุ����ิร���วอร�"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "�ุ�ลั�ษ�ะ�า�อย�า�อา��ะ�ม��หมาะ�ั���ิร���วอร��ั��ุ�ั��อ��ุ�"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "สมุ��ี�อยู� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "รู�ภา��ี��ุ��ลือ�มี��า��ห�� �ุ���อ��าร�รั���า���อ�หรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 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 "
@@ -454,15 +130,15 @@ msgstr ""
 "��ิร���วอร� LDAP �ี�อา��ะ��� LDAP รุ�����า �ึ���ม�รอ�รั��าร�ำ�า��ี� "
 "หรืออา��ะมี�าร�ำห����า�ิ��ลา� �รุ�าสอ��าม�ู��ู�ลระ���อ��ุ� ��ี�ยว�ั��ุ��ั��������หา�ี�รอ�รั�"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "สมุ��ี�อยู��ี��ม�สามาร���ิ����"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "��ิร���วอร�สมุ��ี�อยู��ม�มี�า��าร����ี���ะ�ำ�ลย"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -470,39 +146,39 @@ msgstr ""
 "สมุ��ี�อยู��ี�อา��ะ�ม�สามาร����า�ึ���� หรืออา��ะสะ���ื�อ��ิร���วอร��ิ� "
 "หรือ�าร��ื�อม��อ��รือ��าย�อ��ุ�หลุ���"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "สมุ��ี�อยู��ี��ะ�ู�ล�������าวร"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "��ิร���วอร��ี��ม�รอ�รั���อมูล schema �อ� LDAPv3"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "�ม�สามาร���ิ�สมุ��ี�อยู�"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "�ม�สามาร��ำ��ิ��าร���หา"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "�ม�สามาร��ั��ึ� {0}"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล�หรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 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?"
 msgstr ""
-"�ุ��ำลั��ยายามย�าย�ี�อยู��ิ���อ�า�สมุ��ี�อยู�ห�ึ����ยั�อี��ี�ห�ึ�� ����ม�สามาร�ล�ออ��า�����า���� "
-"�ุ���อ��าร�ะ��ลี�ย������าร�ั��ึ��ี�อยู��ิ���อ�ี�����ารย�ายหรือ�ม�?"
+"�ุ��ำลั��ยายามย�าย�ู��ิ���อ�า�สมุ��ี�อยู�ห�ึ����ยั�อี��ี�ห�ึ�� ����ม�สามาร�ล�ออ��า�����า���� "
+"�ุ���อ��าร�ะ��ลี�ย������าร�ั��ึ��ู��ิ���อ�ี�����ารย�ายหรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -511,2464 +187,710 @@ msgstr ""
 "�ุ��ำลั���ื�อม��อ�ั���ิร���วอร� GroupWise รุ���ี��ม����รอ�รั� อา��ะ�ำ�ห���ิ��ั�หา�าร��� "
 "Evolution �า��ี��ี�ี�สุ��ือ��ิร���วอร��วร�รั��รุ��ห�����ั�รุ���ี�รอ�รั�"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
-msgstr "�ุ��ม�มีสิ��ิ�ล��ี�อยู��ิ���อ��สมุ��ี�อยู��ี�"
+msgstr "�ุ��ม�มีสิ��ิ�ล��ู��ิ���อ��สมุ��ี�อยู��ี�"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "�ุ������ลี�ย���ล�������ี�อยู��ิ���อ�ี����ล�ว �ุ���อ��าร�ั��ึ��าร��ลี�ย���ล�หรือ�ม�?"
+msgstr "�ุ������ลี�ย���ล�������ู��ิ���อ�ี����ล�ว �ุ���อ��าร�ั��ึ��าร��ลี�ย���ล�หรือ�ม�?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "�ี�อยู��ิ���อ {0} �ี��ะยั��ม�สามาร������� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
+msgstr "�ู��ิ���อ {0} �ี��ะยั��ม�สามาร������� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../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:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "_ละ�ิ��"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "�_ม���อ��ั��ึ�"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "_�รั���า�"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 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:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../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:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "�ี�อยู�สำหรั� sync �ริยาย:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "�ม�สามาร��หล�สมุ��ี�อยู�"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "�ม�สามาร�อ�า��ล�อ���ร��รมสมุ��ี�อยู��อ� pilot ���"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "�าร��ิม�ำอั���มั�ิ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "_�ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "��รั�รอ�"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "�ำห����า��ิม���ม�ำอั���มั�ิ�ี��ี�"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
-msgid "Contacts"
-msgstr "�ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "สมุ��ี�อยู� Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address popup"
-msgstr "�ี�อยู��ุ��ึ���า�สมุ��ี�อยู� Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "อ����ระ�อ��ส���ี�อยู���สมุ��ี�อยู��อ� Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "อ����ระ�อ��ส���าม�ั�ร��สมุ��ี�อยู��อ� Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "อ����ระ�อ�สมุ��ี�อยู��อ� Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "�าร�ว��ุม�าร�ั��าร��รั�รอ� S/MIME �อ� Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "�าร�ว��ุม�าร�ำห���าร�ั����า��ล��อร� Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "�ั��าร�าร�รว�สอ� S/MIME �อ��ุ��ี��ี� "
-
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
-msgid "On This Computer"
-msgstr "���อม�ิว��อร��ี�"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
-msgid "Personal"
-msgstr "ส�ว��ุ��ล"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "����ิร���วอร� LDAP"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
-msgctxt "New"
-msgid "_Contact"
-msgstr "�ี�อยู�_�ิ���อ"
-
-#: ../addressbook/gui/component/addressbook-component.c:239
-msgid "Create a new contact"
-msgstr "สร�า��ี�อยู��ิ���อ�หม�"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
-msgctxt "New"
-msgid "Contact _List"
-msgstr "ราย_�ื�อ�ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/component/addressbook-component.c:247
-msgid "Create a new contact list"
-msgstr "สร�า�ราย�ื�อ�ี�อยู��ิ���อ�หม�"
-
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
-msgid "New Address Book"
-msgstr "สมุ��ี�อยู��หม�"
-
-#: ../addressbook/gui/component/addressbook-component.c:254
-msgctxt "New"
-msgid "Address _Book"
-msgstr "_สมุ��ี�อยู�"
-
-#: ../addressbook/gui/component/addressbook-component.c:255
-msgid "Create a new address book"
-msgstr "สร�า�สมุ��ี�อยู��หม�"
-
-#: ../addressbook/gui/component/addressbook-component.c:418
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "�าร�รั�รุ����า�ั��หรือ��ล��อร�สมุ��ี�อยู�ล�ม�หลว"
-
-#: ../addressbook/gui/component/addressbook-config.c:332
-msgid "Base"
-msgstr "�ุ��ริ�ม���"
-
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
-msgid "_Type:"
-msgstr "�ระ�_ภ�:"
-
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy _book content locally for offline operation"
-msgstr "�ั�ลอ���ื�อหา_สมุ��ี�อยู��ว��ี���รื�อ���ื�อ�าร�ำ�า����ออ��ล��"
-
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "�ั�ว��"
-
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "สมุ��ี�อยู�"
-
-#: ../addressbook/gui/component/addressbook-config.c:1003
-msgid "Server Information"
-msgstr "��อมูล��ิร���วอร�"
-
-#: ../addressbook/gui/component/addressbook-config.c:1005
-msgid "Authentication"
-msgstr "�ารยื�ยั��ัว�ุ��ล"
-
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "รายละ�อีย�"
-
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
-msgid "Searching"
-msgstr "�าร���หา"
-
-#: ../addressbook/gui/component/addressbook-config.c:1011
-msgid "Downloading"
-msgstr "�าร�าว���หล�"
-
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "Address Book Properties"
-msgstr "�ุ�สม�ั�ิสมุ��ี�อยู�"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
-msgid "Migrating..."
-msgstr "�ำลั�ย�าย��อมูล..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
-#, c-format
-msgid "Migrating '%s':"
-msgstr "�ำลั�ย�าย��อมูล '%s':"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:646
-msgid "LDAP Servers"
-msgstr "��ิร���วอร� LDAP"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:761
-msgid "Autocompletion Settings"
-msgstr "�าร�ั����า�าร��ิม���ม�ำอั���มั�ิ"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
-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 ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"รู�����อ��าร�ิ���อ�มลลิ�ลิส��มี�าร��ลี�ย���ล�\n"
-"\n"
-"�รุ�ารอ ����ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
-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 ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
-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 �อ��ุ�..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "��ลี�ย��ื�อ��ล��อร� \"%s\" ����:"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
-msgid "Rename Folder"
-msgstr "��ลี�ย��ื�อ��ล��อร�"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
-msgid "Folder names cannot contain '/'"
-msgstr "�ื�อ��ล��อร�มี '/' �ม����"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "สมุ��ี�อยู��_หม�"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "�ั��ึ����� vCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "��ลี�ย�_�ื�อ..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_ล�"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "�ุ�_สม�ั�ิ"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "�ล�อ��ลือ��หล���ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "�ำลั����า�����ิร���วอร� LDAP ����ิร�าม"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
-msgid "Failed to authenticate.\n"
-msgstr "�ารยื�ยั��ัว�ุ��ลล�ม�หลว\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "��อ�รหัส��า�สำหรั� %s (�ู���� %s)"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
-#: ../plugins/publish-calendar/publish-calendar.c:191
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "��อ�รหัส��า�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "�วามยาว��ิม���ม�ำอั���มั�ิ"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML สำหรั�ราย�ื�อ URI สำหรั���ิม���ม"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML สำหรั�ราย�ื�อ URI สำหรั���ิม���ม"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"�ำ�ห����อ��ส���ั����อ���ว�ิ�� ระหว�า���อ��ส���าม�ั�ร�ละราย�าร �ั���อ��ส���ัวอย�า� "
-"��ห��วย�ิ���ล"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "�ส���ื�อ�ี���ิม���มอั���มั�ิ�ร�อม�ี�อยู�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "�ส����อ��ส���ัวอย�า�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr "�ำ�ว�อั��ระ�ี��ะ��อ���อ� ��อ��ี� Evolution �ะ�ยายาม��ิม���มส�ว��ี��หลือ"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "URI �อ���ล��อร��ี����ล�าสุ����ล�อ�����อ��ลือ��ื�อ"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr "URI �อ���ล��อร��ี����ล�าสุ����ล�อ�����อ��ลือ��ื�อ"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Vertical pane position"
-msgstr "�ำ�ห����ส���ั����อ���ว�ิ��"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr "�ำห��ว�า�ะ�ั��ั��ห��ส���ี�อยู�อี�มล�ร�อม�ื�อ�อ��ู��ิ���อ�ี���ิม���มอั���มั�ิ����อ���อ�หรือ�ม�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "�ำห��ว�า�ะ�ส����อ��ส���ัวอย�า�หรือ�ม�"
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Always _show address of the autocompleted contact"
-msgstr "�_ส���ี�อยู��อ��ู��ิ���อ�ี���ิม���มอั���มั�ิ�สมอ"
-
-#: ../addressbook/gui/component/autocompletion-config.c:180
-msgid "Look up in address books"
-msgstr "��ิ�หา�า�สมุ��ี�อยู�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:4
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>�ารยื�ยั��ัว�ุ��ล</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>�าร�าว���หล�</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>�าร���หา</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>��ิ�:</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "��ิ�มสมุ��ี�อยู�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "����สมอ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-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
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-msgid "B_rowse this book until limit reached"
-msgstr "�_รีย��ูสมุ��ี�อยู��ี����ว�า�ะ�ึ��ี��ำ�ั��ี��ำห���ว�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "�ื���า�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Distinguished name"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "�ี�อยู�อี�มล"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution �ะ����ี�อยู�อี�มล�ี���ื�อ�รว�สอ��ุ��ั���ิร���วอร�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "หา�ุ��ั��������หา�ี����������"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "�_��าระ��:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "�ม����"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "�ม�มี�าร���ารหัสลั�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "ระ�ั���ียว"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "���ารหัสลั���วย SSL"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "�ัว�รอ�สำหรั����หา"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "_�ุ��ั��������หา:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "�ัว_�รอ�สำหรั����หา:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "�ัว�รอ�สำหรั����หา"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"�ัว�รอ�สำหรั����หา �ือ��ิ��อ�ออ��������ี��ะหา��ระหว�า��าร���หา ��า�ม�มี�าร��ลี�ย���ล� "
-"�าร���หา��ย���ิ�ะหา objectclass ��ิ� \"person\""
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"�าร�ลือ��ัว�ลือ��ี�หมาย�วามว�า Evolution �ะ��ื�อม��อ�ั���ิร���วอร� LDAP �อ��ุ� "
-"����อ�มื�อ��ิร���วอร� LDAP �อ��ุ�รอ�รั� SSL ���า�ั��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"�าร�ลือ��ัว�ลือ��ี�หมาย�วามว�า Evolution �ะ��ื�อม��อ�ั���ิร���วอร� LDAP �อ��ุ� "
-"����อ�มื�อ��ิร���วอร� LDAP �อ��ุ�รอ�รั� TLS ���า�ั��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"�าร�ลือ��ัว�ลือ��ี�หมาย�วามว�า��ิร���วอร��อ��ุ��ม�รอ�รั��ั�� SSL หรือ TLS "
-"�ึ����หมาย�วามว�า�าร��ื�อม��อ�อ��ุ��ะ�ม��ลอ�ภัย �ละ�สี�ย���อ�ารลั�ลอ������อมูล���"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "ย�อย"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "�ุ��ั��������หา�ี�รอ�รั�"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "���ารหัสลั���วย TLS"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"�ุ��ั��������หา�ะ���� distinguished name (DN) "
-"�อ�ราย�าร�ี��ุ���อ��าร�ห���������ุ��ริ�ม����าร���หา ��า�ุ��ล�อย��อ��ี�ว�า� "
-"�าร���หา�อ��ุ��ะ�ริ�ม�ั�����รา��อ�สาร��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"�อ�����าร���หา�ะ�ำห��ว�า�ุ���อ��าร�ห��าร���หา�ยายลึ�ล������า�ร�อ�สาร�� �อ�����าร���หา "
-"\"ย�อย\" �ะรวม�ุ�ราย�าร�ี�อยู�����ุ��ั��������หา�อ��ุ� �อ�����าร���หา \"ระ�ั���ียว\" "
-"�ะรวมราย�าร�ี�อยู�����ุ��ั��������หา�อ��ุ���ีย�ระ�ั���ียว���า�ั��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr "�ี��ือ�ื�อ���ม�อ���ิร���วอร� LDAP �อ��ุ� �ัวอย�า����� \"ldap.mycompany.com\""
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"�ี��ือ�ำ�ว�สู�สุ��อ�ราย�าร�ี��ะ�าว���หล� "
-"�าร�ั����า�ำ�ว��ี�สู���ิ����ะ�ำ�ห�สมุ��ี�อยู��อ��ุ��ำ�า���าล�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"�ี��ือวิ�ี�ี� Evolution �ะ���ยื�ยั��ัว�ุ��ล�อ��ุ� สั����ว�า�าร�ั����า���� \"�ี�อยู�อี�มล\" "
-"�ะ��อ����า�ึ���ิร���วอร� LDAP �อ��ุ�����ิร�าม�����วย"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"�ี��ือ�ื�อสำหรั���ิร���วอร��ี� �ึ���ะ�รา������ล��อร� Evolution �อ��ุ� "
-"�ะ�����ื�อวั��ุ�ระส����าร�ส�����า�ั��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-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 "
-"port you should specify."
-msgstr ""
-"�ี��ือ�อร������ิร���วอร� LDAP �ี� Evolution �ะ��ื�อม��อ�� �ื�อ�อ��อร��มา�ร�า��ะมี�ว��ห�อยู��ล�ว "
-"�ะ��อ��าม�ู��ู�ลระ���อ��ุ�ว�า�อร���ห��ี��ุ���อ�ระ�ุ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "�ะ��� distinguished name (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "�ะ����ี�อยู�อี�มล"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "�มื�อ���������"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "�_�ิ�มสมุ��ี�อยู�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-msgid "_Download limit:"
-msgstr "_�ำ�ั��าร�าว���หล�:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-msgid "_Find Possible Search Bases"
-msgstr "_หา�ุ��ั��������หา�ี����������"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:52
-msgid "_Login method:"
-msgstr "_วิ�ี�าร���าระ��:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "_�ื�อ:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-msgid "_Port:"
-msgstr "_�อร��:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:55
-msgid "_Search scope:"
-msgstr "_�อ�����าร���หา:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
-msgid "_Server:"
-msgstr "�_�ิร���วอร�:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-msgid "_Timeout:"
-msgstr "�ำ�ั��_วลา:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:58
-msgid "_Use secure connection:"
-msgstr "�_���าร��ื�อม��อ�ิรภัย:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:59
-msgid "cards"
-msgstr "�าม�ั�ร"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:375
-msgid "minutes"
-msgstr "�า�ี"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>อี�มล</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>��า�</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>�ารส����อ�วาม�ั���</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>�า�</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>������ล��</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Other</b>"
-msgstr "<b>อื���</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Telephone</b>"
-msgstr "<b>��รศั���</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Web Addresses</b>"
-msgstr "<b>�ี�อยู��ว������</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Work</b>"
-msgstr "<b>�ี��ำ�า�</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1987
+msgid "Anniversary"
+msgstr "วั��ร�รอ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * 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
+msgid "Birthday"
+msgstr "วั���ิ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../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.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+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
 msgid "Contact"
-msgstr "�ี�อยู��ิ���อ"
+msgstr "�ู��ิ���อ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../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
 msgid "Contact Editor"
-msgstr "��รื�อ�มือ������ี�อยู��ิ���อ"
+msgstr "��รื�อ�มือ������ู��ิ���อ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../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
+msgid "Email"
+msgstr "อี�มล"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "ว�า�/�ม�ว�า�:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "�ื�อ�_��ม..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../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
+msgid "Home Page:"
+msgstr "�ฮม���:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "รู�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "�ารส����อ�วาม�ั���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "อา�ี�"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "�ี�อยู���รษ�ีย�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "������ล��"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "�ื�อ�_ล��:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../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
+msgid "Notes"
+msgstr "�ั��ึ���อ�วาม"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../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
+msgid "Other"
+msgstr "อื���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "��อมูลส�ว��ุ��ล"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "��รศั���"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "�ารส���าภา�:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr "�ี�อยู��ว������"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr "�ว��ล�อ�:"
+
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../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.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "_�ี�อยู�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "วั��ร�_รอ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
-msgstr "_�ู���วย:"
+msgstr "�ู�_��วย:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "วั��_�ิ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../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
 msgid "_Calendar:"
 msgstr "_��ิ�ิ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "�_มือ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
-msgstr "_�ริษั�:"
+msgstr "�ริษั_�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "_�ระ��ศ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "�_���: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "�_�����วย�ื�อ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "_ว�า�/�ม�ว�า�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
-msgstr "�_ฮม���:"
+msgstr "�ฮ_ม���:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
-msgstr "_�ู��ั��าร:"
+msgstr "�ู�_�ั��าร:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "_หมาย�ห�ุ:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "_สำ�ั��า�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "_�ู���รษ�ีย�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "_อา�ี�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
-msgstr "_�ู�สมรส:"
+msgstr "�ู�ส_มรส:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "_รั�/�ั�หวั�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+# "_�ำ�ห���//_�ำ�ำห��า�ื�อ:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
-msgstr "_�ำ�ำห��า�ื�อ:"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "�ารส���า_ภา�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_��อ��ารรั��มล HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "�ว�_�ล�อ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "�_หล��:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_รหัส��รษ�ีย�:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-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-address.c:98
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../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:1827 ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
+#: ../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-address.c:131
-msgid "United States"
-msgstr "สหรั�อ�มริ�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "อั��า�ิส�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "�อล����ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "�อล�ี�รีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "อ�มริ�ั��ามัว"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "อั��อร�รา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "�อ���ลา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "�อ��วิลลา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "�อ��าร���ิ�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "�อ��ิ�า�ละ�าร��ู�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "อาร�����ิ�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "อาร��ม��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "อารู�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "ออส��ร�ลีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "ออส��รีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "อาร���อร����า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "�าฮามาส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "�าห��ร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "�ั��ลา��ศ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "�าร�����ส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "��ลารุส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "��ล�ยียม"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "��ลี�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "���ิ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "��อร�มิว�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "ภู�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "��ลิ�วีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "�อส��ีย�ละ�ฮอร�����วี�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "�อ�สวา�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "��าะ�ู�ว��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "�รา�ิล"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "�ริ�ิ�อิ���ีย��อ��ีย���ร�ริ�อรี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "�รู���ารุส�าลาม"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "�ัล���รีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "��อร��ิ�า�า��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "�ุรุ��ี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "�ัม�ู�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "���มอรู�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "���า�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "����วิร��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "หมู���าะ��ย��ม�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "สา�าร�รั��อ�ริ�า�ลา�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "�ิลี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "�ี�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "��าะ�ริสมาส��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "หมู���าะ (�ีลิ�) ����ส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "��ลัม��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "�อ�ม�รส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "�อ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "สา�าร�รั��อ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "หมู���าะ�ุ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "�อส�าริ�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "����ิวัวร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "��ร�อ��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "�ิว�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "���รัส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "สา�าร�รั�����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "���มาร��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "�ิ�ู�ี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "��มิ�ิ�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "สา�าร�รั���มิ�ิ�ั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "�อ�วา�อร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "อียิ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "�อล�ัลวา�อร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "อิ��ว�อ�รียล�ิ�ี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "�อริ��รีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "�อส����ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "�อ�ิ�อ��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "หมู���าะ�อล���ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "หมู���าะ���ร"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "�ิ�ิ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "�ิ��ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "�รั���ศส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "��ร�����ีย�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "��ร�����ลิ�ี��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "��ร�����า��ิร����ร�ริ�อรีส�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "�า�อ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "��ม��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "�อร���ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "�ยอรม�ี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "�า�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "ยิ�รอล�าร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "�รี�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "�รี��ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "��ร���า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "�วา��อลู�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "�วม"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "�ัว��มาลา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "��ิร���ีย�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "�ิ�ี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "�ิ�ี�ิส��า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "�ายอา�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "�ฮ�ิ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "��าะ�ฮิร���ละหมู���าะ�ม��อ�ัล��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "��รรั�วา�ิ�ั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "ฮอ��ูรัส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "ฮ�อ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "ฮั��ารี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "�อ���ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "อิ���ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "อิ����ี��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "อิหร�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "อิรั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "�อร��ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "��าะ�ม�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "อิสรา�อล"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "อิ�าลี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "�า�ม�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "�ี��ุ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "��อร��ีย�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "�อร����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "�า�ั�ส�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "���ยา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "�ิริ�าส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "��าหลี, สา�าร�รั��ระ�า��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "��าหลี, สา�าร�รั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "�ู�ว�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "�ีร��ี�ส�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "ลาว"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "ลั��วีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "�ล�า�อ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "�ล����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "�ล�ี�รีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "ลิ��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "ลิ����ส����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "ลิ�ัว��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "ลั���ม��ิร��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "มา���า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "มา�ิ����ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "มา�า�ัส�าร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "มาลาวี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "มา�ล��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "มัล�ี�ส�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "มาลี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "มอล�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "หมู���าะมาร���ล"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "มาร��ิ�ี�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "มอริ����ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "มอริ��ียส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "มาย�อ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "�ม���ิ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "�ม��ร�ี��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "มอล��วา, สา�าร�รั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "�ม�า��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "มอ����ลีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "มอ�����อร�รั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "�มร�อ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "�ม�ัม�ิ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "�ม�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "�ามิ��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "�าอูรู"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "���าล"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "����อร��ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "����อร��ล����อ��ิลลิส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "หมู���าะ�ิว��ลิ����ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "�ิว�ี�ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "�ิ�ารา�ัว"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "����อร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "���ี�รีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "�ีอู�อ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "��าะ�อร��อล��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "หมู���าะ�อร���ิร��มา�รีย�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "�อร��วย�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "�อมา�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "�า�ีส�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "�า�ลา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "�ิ����ยึ��รอ��า�ลส����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "�า�ามา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "�า�ัว�ิว�ิ�ี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "�ารา�วัย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "��รู"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "�ิลิ��ิ�ส�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "��าะ�ิ���ร��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "���ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "��ร�ุ��ส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "��อร���ริ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "�า�าร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "�รอู�ีย�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "�รมา��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "สห�ั��รั�รัส��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "รวั��า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "������ิ�ส��ละ��วิส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "�����ลู��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "�����วิ�������ละ��ร�า�ี�ส�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "�ามัว"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "�า�มาริ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "��า���ม �ละ �ริ��ิ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "�าอุ�ีอาระ��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "�����ัล"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "��อร���ีย�ละมอ�������ร"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "����ลส�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "��ียร�ราลี�อ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "สิ����ร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "ส�ลวะ��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "ส�ลวี��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "หมู���าะ���ลมอ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "��มา�ลีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "�อ�ริ�า���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "��าะ��า���อร���ีย�ละหมู���าะ��า�������วิ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "ส���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "ศรีลั��า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "������ฮ�ล�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "����ี�ยร��ละมี��อล�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "�ู�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "�ูริ�า�ม"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "หมู���าะส�าล�าร��ละยา��ม�อ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "สวา�ิ�ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "สวี���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "สวิ���อร��ล���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "�ี�รีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "���หวั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "�า�ิ�ิส�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "����า��ีย, สหสา�าร�รั�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "��ย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "�ิมอร�-�ลส��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "�����ลา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "�อ��า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "�ริ�ิ����ละ������"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "�ู�ิ��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "�ุร�ี"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "��ิร���ม�ิส�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "หมู���าะ��ิ�ส��ละหมู���าะ���อส"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "�ูวาลู"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "ยู�ั��า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "ยู��ร�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "สหรั�อาหรั��อมิ�ร�ส�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "สหรา�อา�า�ั�ร"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "��าะ�ล��รอ��อ��อ�สหรั�อ�มริ�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "อุรุ�วัย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "อุ����ิส�า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "วา�ูอา�ู"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "�ว���ุ�อลา"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "�วีย��าม"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "หมู���าะ�ริ�ิ��วอร��ิ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "หมู���าะ�วอร��ิ��อ�สหรั�อ�มริ�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "หมู���าะวาลลิส�ละหมู���าะ�ุ�ู�า"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "�าฮารา�ะวั���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "�ย�ม�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "��ม��ีย"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "�ิม�ั��ว"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:475
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "�ื�อ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
-msgid "Skype"
-msgstr "Skype"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "�ริ�าร"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "ส�า��ี�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "�ื�อ�ู����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "��า�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
-msgid "Other"
-msgstr "อื���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
+msgid "Error adding contact"
+msgstr "��ิ���อ�ิ��ลา���ะ��ิ�ม�ู��ิ���อ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+msgid "Error modifying contact"
+msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย���ล��ู��ิ���อ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+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:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "สมุ��ลาย�า�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
-msgstr "�����ี�อยู��ิ���อ�หม�"
+msgstr "�����ู��ิ���อ�หม�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "�����อมูล�ี���ีย����"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "�����อมูล�ั��ั�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "มี�าร��ลี�ย���ล�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "��รื�อ�มือ������ี�อยู��ิ���อ - %s"
+msgstr "��รื�อ�มือ������ู��ิ���อ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
 msgid "Please select an image for this contact"
-msgstr "�รุ�า�ลือ�รู�สำหรั��ี�อยู��ิ���อ�ี�"
+msgstr "�รุ�า�ลือ�รู�สำหรั��ู��ิ���อ�ี�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
 msgid "_No image"
 msgstr "�_ม�มีรู�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
-"��อมูล�ี�อยู��ิ���อ�ิ��ลา�:\n"
+"��อมูล�ู��ิ���อ�ิ��ลา�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' มีรู�����ี��ม��ู���อ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' มีรู�����ี��ม��ู���อ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ว�า���ล�า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
 msgid "Invalid contact."
-msgstr "�ี�อยู��ิ���อ�ิ��ลา�"
+msgstr "�ู��ิ���อ�ิ��ลา�"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
-msgstr "�าร��ิ�ม�ี�อยู��ิ���ออย�า��ร�ว"
+msgstr "�าร��ิ�ม�ู��ิ���ออย�า��ร�ว"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "�_�������มรู����"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "_�ื�อ���ม"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "อี�_มล"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "�_ลือ�สมุ��ี�อยู�"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"�ุ������หรือ�ม�ว�า\n"
-"�ะล�ราย�ื�อ�ี�อยู��ิ���อ (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"�ุ������หรือ�ม�ว�า\n"
-"�ะล�ราย�ื�อ�ี�อยู��ิ���อ�หล�า�ี�?"
+#: ../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:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"�ุ������หรือ�ม�ว�า\n"
-"�ะล��ี�อยู��ิ���อ (%s)?"
+#: ../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/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"�ุ������หรือ�ม�ว�า\n"
-"��อ��ารล��ี�อยู��ิ���อหล�า�ี�?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "�ี�อยู� _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "�_มือ�:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "�ระ�_�ศ:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "�ี�อยู�������ม"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "_รหัส��รษ�ีย�:"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "�ร."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "�ื�อ���ม"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "I"
 msgstr "1"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "II"
 msgstr "2"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "III"
 msgstr "3"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "Miss"
 msgstr "�า�สาว"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "Mr."
 msgstr "�าย"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "Mrs."
 msgstr "�า�"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Ms."
 msgstr "�.ส."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_�ื�อ:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "_�ามส�ุล:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "�ื�อ_�ลา�:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "�ำ��อ_��าย�ื�อ:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "��ิ�ม�ั��ี IM"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_�ื�อ�ั��ี:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "_�ริ�าร IM:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "ส�า�_�ี�:"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>สมา�ิ�</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
-msgstr "��รื�อ�มือ�����ราย�ื�อ�ี�อยู��ิ���อ"
+msgstr "��รื�อ�มือ�����ราย�ื�อ�ู��ิ���อ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
-msgid "Select..."
-msgstr "�_ลือ�..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "สมา�ิ�"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_��อ��ี�อยู��มื�อส���มล���ี�ราย�ื�อ�ี�"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "_ราย�ื�อ:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "�_ลือ�..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_�ิม���ี�อยู�อี�มล หรือลา��ี�อยู��ิ���อมาวา��ี�ราย�ื�อ��า�ล�า��ี�:"
+msgstr "_�ิม���ี�อยู�อี�มล หรือลา��ู��ิ���อมาวา��ี�ราย�ื�อ��า�ล�า��ี�:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "สมา�ิ�ราย�ื�อ�ู��ิ���อ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "_สมา�ิ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+msgid "Error adding list"
+msgstr "��ิ���อ�ิ��ลา���ะ��ิ�มราย�ื�อ"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+msgid "Error modifying list"
+msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย���ล�ราย�ื�อ"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+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:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "����ราย�ื�อ�หม�"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
-msgstr "�ี�อยู��ิ���อ�ี���ลี�ย�:"
+msgstr "�ู��ิ���อ�ี���ลี�ย�:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
-msgstr "�ี�อยู��ิ���อ�ี���ำ:"
+msgstr "�ู��ิ���อ�ี���ำ:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
-msgstr "�รว����ี�อยู��ิ���อ��ำ"
+msgstr "�รว����ู��ิ���อ��ำ"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"มี�ื�อหรือ�ี�อยู�อี�มลสำหรั��ี�อยู��ิ���อ�ี�����ล��อร��ี��รีย�ร�อย�ล�ว �ุ�ยั���อ��าร�ะ��ิ�ม���า��อี�หรือ�ม�?"
+"มี�ื�อหรือ�ี�อยู�อี�มลสำหรั��ู��ิ���อ�ี�����ล��อร��ี��รีย�ร�อย�ล�ว �ุ�ยั���อ��าร�ะ��ิ�ม���า��อี�หรือ�ม�?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
-msgstr "�ี�อยู��ิ���อ�หม�:"
+msgstr "�ู��ิ���อ�หม�:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
-msgstr "�ี�อยู��ิ���อ��ิม:"
+msgstr "�ู��ิ���อ��ิม:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"มี�ื�อหรือ�ี�อยู�อี�มลสำหรั��ี�อยู��ิ���อ�ี�����ล��อร��ี��รีย�ร�อย�ล�ว\n"
+"มี�ื�อหรือ�ี�อยู�อี�มลสำหรั��ู��ิ���อ�ี�����ล��อร��ี�อยู���อ��ล�ว\n"
 "�ุ�ยั���อ��าร�ะ��ิ�ม���า��อี�หรือ�ม�?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "_�สา�"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
-msgstr "�สา��ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
-msgid "Email"
-msgstr "อี�มล"
+msgstr "�สา���อมูล�ู��ิ���อ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../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
 msgid "Any field contains"
 msgstr "��อมูล��� มี�ำว�า"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "อี�มล�ึ�������วย"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "�ื�อมี�ำว�า"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
-msgstr "�ม�มี�ี�อยู��ิ���อ"
+msgstr "�ม�มี�ู��ิ���อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
-msgstr[0] "�ี�อยู��ิ���อ %d ราย�าร"
-msgstr[1] "�ี�อยู��ิ���อ %d ราย�าร"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
-msgid "Query"
-msgstr "�ำ���"
+msgstr[0] "�ู��ิ���อ %d ราย�าร"
+msgstr[1] "�ู��ิ���อ %d ราย�าร"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
 msgid "Error getting book view"
 msgstr "��ิ���อ�ิ��ลา���ะสร�า���อ��ส��สมุ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../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:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
+#: ../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 "��อมูล��ร�สร�า�"
 
@@ -2976,114 +898,81 @@ msgstr "��อมูล��ร�สร�า�"
 msgid "Error modifying card"
 msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย���ล��าม�ั�ร"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "�ื�อ�ึ�������วย"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "�ั��ู��ิ���อ�ี��ลือ����า�ลิ��อร��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
-msgid "Source"
-msgstr "�หล��"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "�ั�ลอ��ู��ิ���อ�ี��ลือ����า�ลิ��อร��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:566
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Type"
-msgstr "��ิ�"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "��ะ�ู��ิ���อ�า��ลิ��อร��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
-msgid "Save as vCard..."
-msgstr "�ั��ึ����� vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
+msgid "Delete selected contacts"
+msgstr "ล��ู��ิ���อ�ี��ลือ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "�_�ิ�"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "�ลือ��ู��ิ���อ�ั��หม��ี�มอ��ห��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "_New Contact..."
-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:936
-msgid "New Contact _List..."
-msgstr "_ราย�ื�อ�ี�อยู��ิ���อ�หม�..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
+msgid "Source"
+msgstr "�หล��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Save as vCard..."
-msgstr "_�ั��ึ����� vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "�ุ������หรือ�ม�ว�า�ะล�ราย�ื�อ�ู��ิ���อ�หล�า�ี�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contact"
-msgstr "_ส����อ�ี�อยู��ิ���อ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+msgid "Are you sure you want to delete this contact list?"
+msgstr "�ุ������หรือ�ม�ว�า�ะล�ราย�ื�อ�ู��ิ���อ�ี�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Forward Contacts"
-msgstr "_ส����อ�ี�อยู��ิ���อ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "�ุ������หรือ�ม�ว�า�ะล�ราย�ื�อ�ู��ิ���อ�ี� (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to Contact"
-msgstr "ส��_��อ�วาม��ยั��ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to List"
-msgstr "ส��_��อ�วาม��ยั�ลิส��"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "Send _Message to Contacts"
-msgstr "ส��_��อ�วาม��ยั��ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "_Print"
-msgstr "_�ิม��"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Cop_y to Address Book..."
-msgstr "_�ั�ลอ���ยั�สมุ��ี�อยู�..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-msgid "Mo_ve to Address Book..."
-msgstr "_ย�าย��ยั�สมุ��ี�อยู�..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-msgid "Cu_t"
-msgstr "_�ั�"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_�ั�ลอ�"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+msgid "Are you sure you want to delete these contacts?"
+msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ู��ิ���อ�หล�า�ี�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-msgid "P_aste"
-msgstr "_��ะ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+msgid "Are you sure you want to delete this contact?"
+msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ู��ิ���อ�ี�?"
 
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Any Category"
-msgstr "หมว��������"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "�ุ������หรือ�ม�ว�า�ะล��ู��ิ���อ�ี� (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "�ม��ร��ั�"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"���าร��ิ��ู��ิ���อ %d ราย�าร �ะ��ิ���ห��า��า��หม� %d ห��า��า�\n"
+"�ุ���อ��าร�ห��ส���ู��ิ���อ�หล�า�ี��ั��หม��ริ�หรือ�ม�?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+msgid "_Don't Display"
+msgstr "�_ม��ส��"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+msgid "Display _All Contacts"
+msgstr "�ส���ู��ิ���อ_�ั��หม�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "�ู���วย"
 
@@ -3112,8 +1001,7 @@ msgid "Car Phone"
 msgstr "��รศั���ร�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3121,7 +1009,7 @@ msgid "Categories"
 msgstr "หมว�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "�ริษั�"
 
@@ -3170,22 +1058,22 @@ msgid "Journal"
 msgstr "�ั��ึ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "�ู��ั��าร"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "��รศั���มือ�ือ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "�ื�อ�ล��"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "หมาย�ห�ุ"
 
@@ -3216,12 +1104,11 @@ msgstr "วิ�ยุสื�อสาร"
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
 msgid "Role"
 msgstr "���า�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "�ู�สมรส"
 
@@ -3239,9 +1126,11 @@ msgstr "TTYTDD"
 msgid "Telex"
 msgstr "���ล���"
 
+# "�ำ�ห���//�ื�อ"
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:825
 msgid "Title"
-msgstr "�ำ�ำห��า�ื�อ"
+msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
@@ -3251,63 +1140,59 @@ msgstr "ห��วย�า�"
 msgid "Web Site"
 msgstr "�ว������"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../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:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
+#: ../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:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../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:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3739 ../widgets/text/e-text.c:3740
+#: ../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:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../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:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "�����อมูล"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "�ื�อ�����อมูล"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "��อมูล��อ�วาม"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "�วามยาวสู�สุ��อ��ื�อ�����อมูล"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "�วาม�ว�า��อลัม��"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3315,9 +1200,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"�ำลั����หา�ี�อยู��ิ���อ..."
+"�ำลั����หา�ู��ิ���อ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3327,11 +1212,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"���หา�ี�อยู��ิ���อ\n"
+"���หา�ู��ิ���อ\n"
 "\n"
-"หรือ�ั���ิล�ลิ��ี��ี���ื�อสร�า��ี�อยู��ิ���อ�หม�"
+"หรือ�ั���ิล�ลิ��ี��ี���ื�อสร�า��ู��ิ���อ�หม�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3343,9 +1228,9 @@ msgstr ""
 "\n"
 "�ม�มีราย�าร�ส�����ี��ลย\n"
 "\n"
-"�ั���ิล�ลิ��ร��ี���ื�อสร�า��ี�อยู��ิ���อ�หม�"
+"�ั���ิล�ลิ��ร��ี���ื�อสร�า��ู��ิ���อ�หม�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -3353,9 +1238,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"���หา�ี�อยู��ิ���อ"
+"���หา�ู��ิ���อ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -3365,251 +1250,306 @@ msgstr ""
 "\n"
 "�ม�มีราย�าร�ส�����ี�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "�ัว��ล�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "อี�มล�ี��ำ�า�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "อี�มล��า�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "อี�มลอื���"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "�ลือ�อยู�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "มี��อร���อร�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
-msgid "_Open Link in Browser"
-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
+msgid "evolution address book"
+msgstr "สมุ��ี�อยู� evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
-msgid "_Copy Link Location"
-msgstr "�ั�_ลอ��ี�อยู�ลิ���"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "�ู��ิ���อ�หม�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
-msgid "_Send New Message To..."
-msgstr "ส����อ�วาม�_หม����ึ�..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "ราย�ื�อ�ู��ิ���อ�หม�"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "��ล��อร�สมุ��ี�อยู� %s มี�าม�ั�ร %d ��"
+msgstr[1] "��ล��อร�สมุ��ี�อยู� %s มี�าม�ั�ร %d ��"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "��ิ�"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:153
+msgid "Contact List: "
+msgstr "ราย�ื�อ�ู��ิ���อ: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:154
+msgid "Contact: "
+msgstr "�ู��ิ���อ: "
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:180
+msgid "evolution minicard"
+msgstr "minicard �อ� evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "_�ั�ลอ��ี�อยู�อี�มล"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:370
+msgid "Copy the email address to the clipboard"
+msgstr "�ั�ลอ��ี�อยู�อี�มล���า�ลิ��อร��"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:375
+msgid "_Send New Message To..."
+msgstr "ส����อ�วาม�_หม����ึ�..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:377
+msgid "Send a mail message to this address"
+msgstr "�ะส���มล��ยั��ี�อยู��ี�หรือ�ม�?"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(����ี�)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "����ี�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "สมา�ิ���ราย�ื�อ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "����"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "อา�ี�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "�ำ�ห���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "�ารส���าภา�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../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
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "��ิ�ิ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ว�า�/�ม�ว�า�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "��รศั���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "��รสาร"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+msgid "Address"
+msgstr "�ี�อยู�"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "�ฮม���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "�ว��ล�อ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2576
-msgid "Birthday"
-msgstr "วั���ิ�"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2577
-msgid "Anniversary"
-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
+#: ../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
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "ส�ว��ุ��ล"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "�ำ�ห����า�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "�ฮม���"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "�ว��ล�อ�"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
+#, c-format
+msgid "Click to mail %s"
+msgstr "�ลิ���ื�อส���มล��ยั� %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "สำ�ร��"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "�����อ����ม�ว�า�"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "�หล��������อมูล�ม������ื�อม��ออยู�"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "�ม�มีสมุ��ี�อยู�"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "�ม�����ำห���ี�อยู��ิ���อ�อ��ัว�ู�����อ�"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "�ม����รั�อ�ุ�า�"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
-msgstr "�ม����ี�อยู��ิ���อ"
+msgstr "�ม����ู��ิ���อ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
-msgstr "รหัส�ี�อยู��ิ���อมีอยู��ล�ว"
+msgstr "รหัส�ู��ิ���อมีอยู��ล�ว"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "��ร���อล�ี��ม�รอ�รั�"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#. To Translators: This is task status
+#: ../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
 msgid "Canceled"
 msgstr "ย��ลิ�"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
-msgstr "�ม�สามาร�ย��ลิ�"
+msgstr "�ม�สามาร�ย��ลิ����"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "�ารยื�ยั��ัว�ุ��ลล�ม�หลว"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "��อ�ยื�ยั��ัว�ุ��ล"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS ����า��ม����"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "�ม�มี�หล���ั��ล�าว"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "������หม�ออ��ล���ม����"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "��อ�ิ��ลา�อื���"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "รุ����ิร���วอร�����ม����"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "�ม�รอ�รั�วิ�ียื�ยั��ัว�ุ��ลวิ�ี�ี�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3619,7 +1559,7 @@ msgstr ""
 "หรือยั��ม�����าว���หล�สำหรั�������ออ��ล�� �รุ�า�รีย�อ�า�สมุ��ี�อยู�อี��รั�����ออ��ล�� "
 "��ื�อ�าว���หล�มา��������ออ��ล��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -3627,7 +1567,7 @@ msgid ""
 msgstr ""
 "�ม�สามาร���ิ�สมุ��ี�อยู��ี���� �รุ�า�รว�สอ�ว�ามี�า� %s อยู� หรือ�ูว�า�ุ�มีสิ��ิ����าร���า�ึ�หรือ�ม�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -3635,7 +1575,7 @@ msgstr ""
 "Evolution รุ���ี� �ม����มี�าร�อม��ล���ื�อรอ�รั� LDAP �าร��� LDAP �� Evolution "
 "�ะ��อ��ิ��ั���������อ� Evolution �ี���ิ�����า� LDAP"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -3643,11 +1583,11 @@ msgstr ""
 "�ม�สามาร���ิ�สมุ��ี�อยู��ี���� �ึ�����������ว�า URI �ี���อ�อา��ม��ู���อ� "
 "หรืออา��ะ�ม�สามาร��ิ���อ�ั���ิร���วอร����"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "รายละ�อีย���อ�ิ��ลา�:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3658,7 +1598,7 @@ msgstr ""
 "Evolution �ส���ล �รุ�า���หา�วย�ำ����ี����าะ��าะ���ว�า�ี�\n"
 "หรือ��ิ�ม�ี��ำ�ั���ห��า��า��รั�������ิร���วอร�สาร��สำหรั�สมุ��ี�อยู��ี�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -3669,440 +1609,144 @@ msgstr ""
 "สำหรั�สมุ��ี�อยู��ี� �รุ�า���หา�วย�ำ����ี����าะ��าะ���ว�า�ี�\n"
 "หรือ��ิ�ม��า�ำ�ั��วลา ��ห��า��า��รั�������ิร���วอร�สาร��สำหรั�สมุ��ี�อยู��ี�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "�����อ���สำหรั�สมุ��ี�อยู��ี��ม�สามาร�����ำ����ี����"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
-msgstr "�����อ���สำหรั�สมุ��ี�อยู��ี���ิิ�ส��ี��ะ����ำ����ี�"
+msgstr "�����อ���สำหรั�สมุ��ี�อยู��ี���ิ�ส��ี��ะ����ำ����ี�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "�ำ����ี��ม�สำ�ร��สม�ูร��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "��ิ���อ�ิ��ลา���ะ��ิ�มราย�ื�อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
-msgid "Error adding contact"
-msgstr "��ิ���อ�ิ��ลา���ะ��ิ�ม�ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย���ล�ราย�ื�อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "��ิ���อ�ิ��ลา���ะ��ลี�ย���ล��ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "��ิ���อ�ิ��ลา���ะล�ราย�ื�อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
-msgid "Error removing contact"
-msgstr "��ิ���อ�ิ��ลา���ะล��ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"���าร��ิ��ี�อยู��ิ���อ %d ราย�าร �ะ��ิ���ห��า��า��หม� %d ห��า��า�\n"
-"�ุ���อ��าร�ห��ส���ี�อยู��ิ���อ�ี��ริ�หรือ�ม�?"
-msgstr[1] ""
-"���าร��ิ��ี�อยู��ิ���อ %d ราย�าร �ะ��ิ���ห��า��า��หม� %d ห��า��า�\n"
-"�ุ���อ��าร�ห��ส���ี�อยู��ิ���อ�ั��หม��ี��ริ�หรือ�ม�?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "�_ม��ส��"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "�ส���ี�อยู��ิ���อ_�ั��หม�"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s มีอยู��ล�ว\n"
-"�ุ���อ��าร��ีย��ั�หรือ�ม�?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
-msgid "Overwrite"
-msgstr "��ีย��ั�"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "�ี�อยู��ิ���อ"
-msgstr[1] "�ี�อยู��ิ���อ"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:247
 msgid "Select Address Book"
 msgstr "�ลือ�สมุ��ี�อยู�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:310
 msgid "list"
 msgstr "ราย�ื�อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contact to"
-msgstr "ย�าย�ี�อยู��ิ���อ��ยั�"
+msgstr "ย�าย�ู��ิ���อ��ยั�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contact to"
-msgstr "�ั�ลอ��ี�อยู��ิ���อ��ยั�"
+msgstr "�ั�ลอ��ู��ิ���อ��ยั�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:442
 msgid "Move contacts to"
-msgstr "ย�าย�ี�อยู��ิ���อ��ยั�"
+msgstr "ย�าย�ู��ิ���อ��ยั�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Copy contacts to"
-msgstr "�ั�ลอ��ี�อยู��ิ���อ��ยั�"
+msgstr "�ั�ลอ��ู��ิ���อ��ยั�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "vCard หลายราย�าร"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard สำหรั� %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "��อมูล�ี�อยู��ิ���อ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "��อมูล�ี�อยู��ิ���อ�อ� %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
-msgid "Querying Address Book..."
-msgstr "�ำลั����สมุ��ี�อยู�..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "มี�ี�อยู��ิ���ออื��ห�ึ��ราย�าร"
-msgstr[1] "มี�ี�อยู��ิ���ออื�� %d ราย�าร"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "�ส�� vCard ������ม"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "�ส�� vCard ����ระ�ั�"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "�ั��ึ���สมุ��ี�อยู�"
-
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "มุมมอ��าม�ั�ร"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
-#: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../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
 msgid "Importing..."
 msgstr "�ำลั��ำ���า..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV �อ� Outlook หรือ���� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "��รื�อ�มือ�ำ���า Outlook CSV �ละ����"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV หรือ���� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "��รื�อ�มือ�ำ���า Mozilla CSV �ละ����"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV หรือ���� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "��รื�อ�มือ�ำ���า CSV �ละ�����อ� Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "��รื�อ�มือ�ำ���า LDIF �อ� Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "��รื�อ�มือ�ำ���า vCard �อ� Evolution"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "����อร�ม��ล�า��อ��าย:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "�ัว��ื�อหา"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "ล�า�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "��า�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "���_อั�ษร..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "���อั�ษร"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "��าย�ระ�าษ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "รู����"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "หัว�ระ�าษ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "หัว�ระ�าษ/��าย�ระ�าษ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "หัว�ระ�าษ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "หัว�ระ�าษสำหรั���หมาย���ละ��ั�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "สู�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "�รีย��ิ���อ�ั�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "�ส��:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "��ว�อ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "��าย:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "����หมว�อั�ษร��า���า�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "�อ��ระ�าษ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "�ำ�ว��อลัม��:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "�ัว�ลือ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "��ววา�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "ห��า"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "�ั����าห��า�ระ�าษ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "�ระ�าษ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "�หล���ระ�าษ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "��ว�ั��"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "�ัวอย�า�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "�ิม����วย���สี��า"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "�ลิ��ลั�ห��า�ู�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "�วา:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "ส�ว���า��:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "�าร�ร��า"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "��า�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "�ริ�ม�ี�ห��า�หม�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "�ื�อส��ล�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "��:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "��ิ�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "�ว�า�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "�_��อั�ษร..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../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
 msgid "Can not open file"
 msgstr "�ม�สามาร���ิ����ม"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "�ม�สามาร�อ�า�ราย�ื�อ�อ�สมุ��ี�อยู�"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "�ม�สามาร���ิ�สมุ��ี�อยู�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "ระ�ุ���ม�อา���ุ�����าร�ส���ลมา�ร�า�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "ราย�ื�อ�อ���ล��อร�สมุ��ี�อยู�����รื�อ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "�ส���าม�ั�ร���� vcard หรือ���ม csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "ส��ออ������หม� asynchronous"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "�ำ�ว��อ��าม�ั�ร��อห�ึ�����ม�ลลั������หม� asychronous �ำ�ว��ริยาย�ือ 100 "
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "NUMBER"
 
@@ -4127,6 +1771,30 @@ msgstr "���หม����ิ�ม��ำ������อ�ม
 msgid "Unhandled error"
 msgstr "��อ�ิ��ลา��ี��ม����รอ�รั��ว�"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "�ำลั����า�����ิร���วอร� LDAP ����ิร�าม"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
+msgid "Failed to authenticate.\n"
+msgstr "�ารยื�ยั��ัว�ุ��ลล�ม�หลว\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#, 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/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "��อ�รหัส��า�"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -4199,266 +1867,262 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "�ุ������หรือ�ม�ว�า�ะล��ั�หมาย�รื�อ� '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "�ุ������หรือ�ม�ว�า�ะล��าร�ระ�ุม�รื�อ� '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ั��ึ���วย�ำ '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ั�หมาย�ั�� {0} �ิ���ี�?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ั��ึ���วย�ำ�ั�� {0} �ิ���ี�?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล�ภาร�ิ��ั�� {0} �ิ���ี�?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ั�หมาย�ี�?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��าร�ระ�ุม�ี�?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล��ั��ึ���วย�ำ�ี�?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารล�ภาร�ิ��ี�?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��าร�ั��ึ��ั��ึ���วย�ำ��ย�ม���อ�มีสรุ�?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารส���ั�หมาย��ย�ม���อ�มีสรุ�?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��ารส��ภาร�ิ�����ย�ม���อ�มีสรุ�?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "�หล��������อมูล��ิ�ิ��ม������ื�อม��ออยู�"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "�ม�สามาร�สร�า��ห�ุ�าร���หม�"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "�ม�สามาร��ั��ึ��ห�ุ�าร��"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "ล���ิ�ิ� '{0}' หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "ล�ราย�าร�ั��ึ���วย�ำ '{0}' หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "ล�ราย�ารภาร�ิ� '{0}' หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "�_ม�ส��"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "�ำลั��าว���หล� �ุ���อ��าร�ั��ึ��ั�หมายหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "�ำลั��าว���หล� �ุ���อ��าร�ั��ึ�ภาร�ิ�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "�ม�สามาร��หล���รื�อ�มือ�����"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "�ะส��อี�มล��ิ���ยั��ู�มีส�ว�ร�วม�ั��หม� �ละ�ะอ�ุ�า��ห��ุ���รั�ภาร�ิ��ี�"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "�ะส��อี�มล��ิ���ยั��ู�ร�วม�ระ�ุม�ั��หม� �ละ�ห��ุ����อ��ลั�มา���"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "��ิ���อ�ิ��ลา���ะ�รีย��ู��ิ�ิ�"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "��ิ���อ�ิ��ลา���ะ�รีย��ูราย�าร�ั��ึ���วย�ำ"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "��ิ���อ�ิ��ลา���ะ�รีย��ูราย�ารภาร�ิ�"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "��ิ���อ�ิ��ลา��ี� '{0}'"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 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:46
+#: ../calendar/calendar.error.xml.h:47
 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:47
+#: ../calendar/calendar.error.xml.h:48
 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:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "�ม�มี�าร�อ�ส�อ��า���ิร���วอร�"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "�ั��ึ��ั�หมาย"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "�ั��ึ��ั��ึ���วย�ำ"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "�ั��ึ�ภาร�ิ�"
-
-#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "�ารส����อมูล�ี��รั��รุ�สามาร��ห��ู�มีส�ว�ร�วม��อื������รั��รุ���อมูล�ี���ิ�ิ���วย"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "�ารส����อมูล�ี��รั��รุ�สามาร��ห��ู�มีส�ว�ร�วม��อื������รั��รุ�ราย�ารภาร�ิ���วย"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "�ำลั�อยู�ระหว�า��าว���หล����ม����า��ิ�� ��า�ุ��ั��ึ��ั�หมาย�อ��ี� �ะสู��สีย���ม����ั��ล�าว"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "�ำลั�อยู�ระหว�า��าว���หล����ม����า��ิ�� ��า�ุ��ั��ึ�ภาร�ิ��อ��ี� �ะสู��สีย���ม����ั��ล�าว"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "�ุ�ลั�ษ�ะ�า�อย�า�อา��ำ�า��ม�สม�ูร������ิร���วอร��ั��ุ�ั��อ��ุ�"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "��ิ�ิ� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "��ิ�ิ� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "�ั��ึ���วย�ำ Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ภาร�ิ� Evolution หยุ��ำ�า��ระ�ั�หั�"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "�ม�����ำ��รื�อ�หมาย�ี���ิ�ิ���ื�อ�าร����า����ออ��ล��"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "�ม�����ำ��รื�อ�หมาย�ี�ราย�าร�ั��ึ���วย�ำ��ื�อ�าร����า����ออ��ล��"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "�ม�����ำ��รื�อ�หมาย�ี�ราย�ารภาร�ิ���ื�อ�าร����า����ออ��ล��"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "��ิ�ิ��ี��ะ�ู�ล�ออ�อย�า��าวร"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "ราย�าร�ั��ึ���วย�ำ�ี��ะ�ู�ล�ออ�อย�า��าวร"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "ราย�ารภาร�ิ��ี��ะ�ู�ล�ออ�อย�า��าวร"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "�ม�สามาร���ิ���ิ�ิ�"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
-msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��ั�หมาย�ี�หรือ�ม�?"
+msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ����ั�หมาย�ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to save your changes to this meeting?"
+msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ����าร�ระ�ุม�ี�หรือ�ม�?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ����ั��ึ���วย�ำ�ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ���ภาร�ิ��ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�ุ���อ��ารส���ระ�าศ�ารย��ลิ�สำหรั��ั��ึ���วย�ำ�ี�หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "�ุ���อ��ารส���ระ�าศ�����ารย��ลิ���ยั��ู�มีส�ว�ร�วม�ุ���หรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "�ุ���อ��ารส���าร��ิ��ระ�ุม��ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "�ุ���อ��ารส��ภาร�ิ��ี���ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "�ุ���อ��ารส����อมูล�าร�ระ�ุม�ี��รั��รุ���ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "�ุ���อ��ารส����อมูล�ี��รั��รุ��อ�ภาร�ิ���ยั��ู�มีส�ว�ร�วมหรือ�ม�?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4467,72 +2131,76 @@ msgstr ""
 "�ุ��ำลั���ื�อม��อ�ั���ิร���วอร� GroupWise รุ���ี��ม����รอ�รั� อา��ะ�ำ�ห���ิ��ั�หา�าร��� "
 "Evolution �า��ี��ี�ี�สุ��ือ�วร�รั�รุ����ิร���วอร��ห�����รุ���ี�รอ�รั�"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "�ุ������ลี�ย���ล��ั�หมาย�ี� ���ยั��ม�����ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:78
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "�ุ������ลี�ย���ล��าร�ระ�ุม�ี� ���ยั��ม�����ั��ึ�"
+
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "�ุ������ลี�ย���ล�ภาร�ิ��ี� ���ยั��ม�����ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "�ุ������ลี�ย���ล��ั��ึี���อ�วาม�ี� ���ยั��ม�����ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "��ิ�ิ��อ��ุ��ะ����า��ม���� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "�ั��ึ���วย�ำ�อ��ุ��ะ����า��ม���� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "��อมูลภาร�ิ��อ��ุ��ะ����า��ม���� ���ว�า�ะ�ริ�ม�าร�ำ�า��อ� Evolution �หม�"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "�_ม�ส����าร��ลี�ย���ล�"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "_�ั��ึ�"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "_�ั��ึ��าร��ลี�ย���ล�"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_ส��"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "_ส���ระ�าศ"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "�ย��ห�ุ�าร���ี��ิ��วลาหลายวั�:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
 #: ../calendar/conduits/memo/memo-conduit.c:821
 #: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "�ม�สามาร��ริ�ม��ิร���วอร���อมูล evolution"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "�ม�สามาร�อ�า��ล�อ���ร��รม��ิ�ิ��อ� pilot ���"
 
@@ -4546,201 +2214,122 @@ msgstr "�ม�สามาร�อ�า��ล�อ���ร��ร
 msgid "Could not write pilot's Memo application block"
 msgstr "�ม�สามาร���ีย��ล�อ���ร��รม�ั��ึ���วย�ำ�อ� pilot ���"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "ระ�ั��วามสำ�ั���ย�ริยาย:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
 #: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "�ม�สามาร�อ�า��ล�อ���ร��รม ToDo �อ��าล�ม���"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
 #: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "�ม�สามาร���ีย��ล�อ���ร��รม ToDo �อ��าล�ม���"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
-msgid "Calendar and Tasks"
-msgstr "��ิ�ิ��ละภาร�ิ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
-msgid "Calendars"
-msgstr "��ิ�ิ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "�ำห����า�วลา���ระ��ศ ��ิ�ิ� �ละราย�ารภาร�ิ��อ��ุ��ี��ี�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "��ิ�ิ��ละภาร�ิ� Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "�าร�ว��ุม�าร�ำห����า��ิ�ิ� Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "��รื�อ�มือ�ส����อ�วาม�าร�ั��วลา��ิ�ิ��อ� Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "��รื�อ�มือ����� ��ิ�ิ�/ภาร�ิ� Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "อ����ระ�อ���ิ�ิ��อ� Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "อ����ระ�อ��ั��ึ���วย�ำ�อ� Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "อ����ระ�อ�ภาร�ิ��อ� Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "�ั��ึ�_��วย�ำ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:389
-#: ../calendar/gui/memos-control.c:405
-msgid "Memos"
-msgstr "�ั��ึ���วย�ำ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "ภาร�ิ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_��ิ�ิ�"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_ภาร�ิ�"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "�ริ�าร�าร�ระ�าศ������ือ���ิ�ิ� Evolution"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "�า�ี"
 msgstr[1] "�า�ี"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:376
-msgid "hours"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "�ั�ว�ม�"
 msgstr[1] "�ั�ว�ม�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "�วลา�ริ�ม"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "�ั�หมาย"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "ละ�ิ���ั��ห_ม�"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../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
 msgid "Location:"
 msgstr "ส�า��ี�:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "��ว��_วลา�ั���อ�:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "_ละ�ิ��"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1621
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "�_����"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "_�ั���อ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../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
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+msgid "hours"
+msgstr "�ั�ว�ม�"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ส�า��ี��ั�หมาย"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../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
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "minutes"
+msgstr "�า�ี"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
 msgid "No summary available."
 msgstr "�ม�มีสรุ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
 msgid "No description available."
 msgstr "�ม�มี�ำอ�ิ�ายรายละ�อีย�อยู�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
 msgid "No location information available."
 msgstr "�ม�มี��อมูลส�า��ี�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
 msgstr "�ุ�มี�าร��ือ� %d ราย�าร"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "�ำ��ือ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4751,7 +2340,7 @@ msgstr ""
 "����าร��ือ��วาม�ำ�ี�����ำห����า�ห�ส��อี�มล\n"
 "Evolution �ะ�ส���ล�อ�����อ���ือ��วาม�ำ�าม���ิ���"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4768,20 +2357,10 @@ msgstr ""
 "\n"
 "�ุ������หรือ�ม� �ี��ะ�รีย���ร��รม�ี�?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 msgid "Do not ask me about this program again."
 msgstr "�ม���อ��าม��ี�ยว�ั���ร��รม�ี�อี��รั��"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "�ม�สามาร��ริ�ม����า� Bonobo ���"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr "�ม�สามาร�สร�า��ร��า��ริ�าร������ือ���� �า��ี�ร��า�อา���ิ��ำ�า�อยู��ล�ว..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "�วลา�ม��ู���อ�"
@@ -4817,10 +2396,10 @@ msgstr[1] "%d วิ�า�ี"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
-msgstr "��ร��รม�าร��ือ�"
+msgstr "��ร��รม��ือ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "��ว��วลา����วิ�า�ี�ี��ะ�ส����อ�ิ��ลา������ส�า�ะ"
 
@@ -4858,141 +2437,169 @@ msgid "Confirm expunge"
 msgstr "ยื�ยั��าร�����วา�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "�ำ�ว��าร�วีย���ำ�ริยาย�อ��ห�ุ�าร���หม� -1 หมาย�ึ��วีย���ำ�ลอ���"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "วั��ี��วรระ�ุ�วลา�ริ�ม�ละสิ��สุ��ั�ว�ม��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "�าร��ือ��วลา�ั�หมาย��ย�ริยาย"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Default recurrence count"
+msgstr "�ำ�ว��าร�วีย���ำ�ริยาย"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ห��วย��ือ��วาม�ำ�ริยาย"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "��า��ือ��วาม�ำ�ริยาย"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "���ร��อรีสำหรั��ั��ึ����ม�สีย���ือ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "�าร�ล�ระ�ั�สี����อ��ห�ุ�าร��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "�วาม��ร���ส�อ���อ��ส���ห�ุ�าร��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "ราย�ื�อ URL �อ���ิร���วอร�ส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "���ร�า� URL ส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "�าร�ล�ระ�ั�สี�อ���อ��ส���ห�ุ�าร����มุมมอ���ิ�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "��อ�ภาร�ิ��ี��สร���ล�ว"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "��อ�ห��วย�อ�ภาร�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "��อ���า�อ�ภาร�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "�ำ�ห����อ��ส���ั����อ���ว�อ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "�ั�ว�ม�สิ��สุ�วั��ำ�า���รู���� 24 �ั�ว�ม� มี��า�ั����� 0 �ึ� 23"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "�ั�ว�ม��ริ�ม���วั��ำ�า���รู���� 24 �ั�ว�ม� มี��า�ั����� 0 �ึ� 23"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "��า���� \"true\" �ะ�ส����อ��ส���ัวอย�า��ั��ึ���อ�วาม��ห��า��า�หลั�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "��า���� \"true\" �ะ�ส����อ��ส���ัวอย�า�ภาร�ิ���ห��า��า�หลั�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "��ว��วลา�ี��ะ�ส����มุมมอ�วั��ละสั��าห��ำ�า� �����า�ี"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "�วลา��ือ�ล�าสุ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "ระ�ั��อ���อ�วาม�ี��ะ�ั��ึ����ูม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "ราย�ื�อ�อ�����วลา�ี�สอ��ี����ล�าสุ���มุมมอ�วั�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "ราย�ื�อ�อ� URL �อ���ิร���วอร��ระ�าศส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "�ส�� Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "สี�อ��ส�� Marcus Bains - มุมมอ�วั�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "สี�อ��ส�� Marcus Bains - ����วลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "�ำ�ว�สู�สุ��อ�����วลา�ี����ล�าสุ��ี��ะ�ำ�ว���ราย�ื�อ 'day_second_zones'"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "�ำ�ว�สู�สุ��อ�����วลา�ี�สอ��ี��ะ�ำ�ว�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+msgid "Memo layout style"
+msgstr "รู�����าร�ั�ห��า�อ�ั��ึ���อ�วาม"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid "Memo preview pane position (horizontal)"
+msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า��ั��ึ���อ�วาม (��ว�อ�)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (vertical)"
+msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า��ั��ึ���อ�วาม (��ว�ั��)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "�า�ี�ี�วั��ำ�า�สิ��สุ�, 0 �ึ� 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "�า�ี�ี�วั��ำ�า��ริ�ม���, 0 �ึ� 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "�ำ�ห����อ��ส���ั����อ���ว�อ� ��มุมมอ���ือ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
-msgstr "�ำ�ห����ส���ั����อ���ว�ิ�� ��มุมมอ���ือ�"
+msgstr "�ำ�ห����ส���ั����อ���ว�ั�� ��มุมมอ���ือ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "�ำ�ว��อ�ห��วยสำหรั��ำห���าร��ือ��วาม�ำ��ย�ริยาย"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "�ำ�ว�ห��วยสำหรั��ำห���าร��อ�ภาร�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "สี�อ�ภาร�ิ��ี��ลย�ำห��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5000,7 +2607,7 @@ msgstr ""
 "�ำ�ห����อ��ส���ั����อ���ว�อ� ระหว�า���ิ�ิ��ลือ�วั��ี��ั�ราย�ารภาร�ิ� "
 "�มื�อ�ม����อยู���มุมมอ�ราย��ือ� ��ห��วย�ิ���ล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5008,112 +2615,140 @@ msgstr ""
 "�ำ�ห����อ��ส���ั����อ���ว�อ� ระหว�า���อ��ส����อมูล�ั���ิ�ิ��ลือ�วั��ี� �มื�ออยู���มุมมอ�ราย��ือ� "
 "��ห��วย�ิ���ล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "�ำ�ห����อ��ส���ั����อ��ส���ัวอย�า��ั��ึ���อ�วาม �มื�อ�ั�วา�����ว�ั��"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "�ำ�ห����อ��ส���ั����อ��ส���ัวอย�า�ภาร�ิ� �มื�อ�ั�วา�����ว�อ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "�ำ�ห����อ��ส���ั����อ��ส���ัวอย�า�ภาร�ิ� �มื�อ�ั�วา�����ว�ั��"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
-msgstr "�ำ�ห����อ��ส���ั����อ���ว�ิ�� ระหว�า���อ�ราย�าร��ิ�ิ� �ั���อ��ลือ�วั��ี���วย��ิ�ิ�"
+msgstr "�ำ�ห����อ��ส���ั����อ���ว�ั�� ระหว�า���อ�ราย�าร��ิ�ิ� �ั���อ��ลือ�วั��ี���วย��ิ�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr "�ำ�ห����อ��ส���ั����อ���ว�ิ�� ระหว�า���อ�ราย�ารภาร�ิ��ั���อ��ส���ัวอย�า� ��ห��วย�ิ���ล"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"�ำ�ห����อ��ส���ั����อ���ว�ิ�� ระหว�า���อ��ส����อมูล�ั���อ���ิ�ิ��ลือ�วั��ี� �มื�ออยู���มุมมอ�ราย��ือ� "
+"�ำ�ห����อ��ส���ั����อ���ว�ั�� ระหว�า���อ��ส����อมูล�ั���อ���ิ�ิ��ลือ�วั��ี� �มื�ออยู���มุมมอ�ราย��ือ� "
 "��ห��วย�ิ���ล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"�ำ�ห����อ��ส���ั����อ���ว�ิ�� ระหว�า���อ��ส����อมูล�ั���อ���ิ�ิ��ลือ�วั��ี��ละราย�ารภาร�ิ� "
+"�ำ�ห����อ��ส���ั����อ���ว�ั�� ระหว�า���อ��ส����อมูล�ั���อ���ิ�ิ��ลือ�วั��ี��ละราย�ารภาร�ิ� "
 "�มื�ออยู���มุมมอ�ราย��ือ� ��ห��วย�ิ���ล"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary calendar"
+msgstr "��ิ�ิ�หลั�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary memo list"
+msgstr "ราย�าร�ั��ึ���วย�ำหลั�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+msgid "Primary task list"
+msgstr "ราย�ารภาร�ิ�หลั�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "��ร��รม�ี�อ�ุ�า��ห��รีย����าร��ือ���า��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "����วลา�ี�สอ��ี����ล�าสุ���มุมมอ�วั�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "���ร��อรีสำหรั��ั��ึ��สีย���ือ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "�ลื�อ�มุมมอ���ือ��ีละสั��าห�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "�ส����อ���อมูล�ารร�อ��อ�าร�อ��ลั�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "�ส����อ���อมูล���า�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "�ส���วลาสิ��สุ��ั�หมาย��มุมมอ�สั��าห��ละ��ือ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "�ส����อ���อมูลหมว�หมู������รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "�ส���าร��ือ����า�������ือ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "�ส����อ���อมูลส�า�ะ����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Show the \"Preview\" pane"
-msgstr "�ส����อ� \"�ส���ัวอย�า�\""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid "Show the memo preview pane"
+msgstr "�ส����อ��ส���ัวอย�า��ั��ึ���อ�วาม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Show the \"Preview\" pane."
-msgstr "�ส����อ� \"�ส���ัวอย�า�\""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the task preview pane"
+msgstr "�ส����อ��ส���ัวอย�า�ภาร�ิ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "�ส����อ���อมูล����วลา����รื�อ�มือ������ห�ุ�าร��/�าร�ระ�ุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "�ส����อ���อมูล��ิ�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุม"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr "�ส��สั��าห��ี���มุมมอ�วั��ละสั��าห��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../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:65
+#: ../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:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "รู�����าร�ั�ห��า�อภาร�ิ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า�ภาร�ิ� (��ว�อ�)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า�ภาร�ิ� (��ว�ั��)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "สี�อ�ภาร�ิ��ี��ึ��ำห��วั��ี�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Tasks vertical pane position"
-msgstr "�ำ�ห����ส���ั����อ���ว�ิ�� ��มุมมอ�ภาร�ิ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5122,7 +2757,7 @@ msgstr ""
 "���ร�า� URL �ี��ะ���������อมูลสำรอ�สำหรั�ส�า�ะว�า�/�ม�ว�า� ��� %u ���ส�ว��ู�������ี�อยู��มล �ละ %"
 "d ������ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5130,370 +2765,216 @@ msgstr ""
 "����วลา�ริยาย�ี��ะ�����วั��ละ�วลา����ิ�ิ� ��ย�ำห�������ำ�ห����า���อมูล����วลา Oslen "
 "�ี�ยั��ม���ล����ภาษา��อ��ิ�� ���� \"Asia/Bangkok\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+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 "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"รู�����าร�ั�ห��า�อ�ะ�ำห���ำ�ห����อ���อ��ส���ัวอย�า���ีย��ั�ราย�ื�อ�ั��ึ���อ�วาม \"0\" "
+"(�����ั�) �ะวา���อ��ส���ัวอย�า��ว����ราย�ื�อ�ั��ึ���อ�วาม \"1\" (�����ว�ั��) "
+"�ะวา���อ��ส���ัวอย�า��ว���า�ราย�ื�อ�ั��ึ���อ�วาม"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+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 "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"รู�����าร�ั�ห��า�อ�ะ�ำห���ำ�ห����อ���อ��ส���ัวอย�า���ีย��ั�ราย�ารภาร�ิ� \"0\" "
+"(�����ั�) �ะวา���อ��ส���ัวอย�า��ว����ราย�ารภาร�ิ� \"1\" (�����ว�ั��) "
+"�ะวา���อ��ส���ัวอย�า��ว���า�ราย�ารภาร�ิ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "����วลา�ี�สอ�สำหรั�มุมมอ�วั�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 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:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "��ว��วลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "�วลา�อ��าร��ือ��รั����อ� ������ิ� time_t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "����วลา"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 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:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "รู�����วลา 24 �ั�ว�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "URI �อ���ิ�ิ��ี�����อยู� (��ิ�ิ� \"หลั�\")"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "URI �อ�ราย�าร�ั��ึ���วย�ำ�ี�����อยู� (ราย�าร�ั��ึ���วย�ำ \"หลั�\")"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "URI �อ�ราย�ารภาร�ิ��ี�����อยู� (ราย�ารภาร�ิ� \"หลั�\")"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ห��วยสำหรั��าร��ือ��วาม�ำ��ย�ริยาย \"�า�ี\", \"�ั�ว�ม�\" หรือ \"วั�\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ห��วย�อ��าร�ำห���าร��อ�ภาร�ิ� ���� \"�า�ี\", \"�ั�ว�ม�\" หรือ \"วั�\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "�������วลา�อ�ระ��"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "�������วลา�อ�ระ���������วลา�ี��ลือ��ว��� Evolution"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "�ำ�ห����ส���ั����อ���ว�ั��"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "�ริ�ม���สั��าห�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "วั���สั��าห��ริ�ม���สั��าห��า�วั�อา�ิ�ย� (0) �ึ�วั��สาร� (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "�ำห��ว�า�ะ����า�������ือ��ส���าร��ือ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "�ำห��ว�า�ะ�ามยื�ยั���อ�ล��ั�หมายหรือภาร�ิ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "�ำห��ว�า�ะ�ามยื�ยั��มื�อ�ะ�����วา��ั�หมาย�ละภาร�ิ��ี�สั��ล�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 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:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "�ำห��ว�า�ะ�ส���วลาสิ��สุ��อ��ห�ุ�าร����มุมมอ�สั��าห��ละ��ือ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 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:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "�ำห��ว�า�ะ��อ�ภาร�ิ��ี��สร���ล�ว��มุมมอ�ภาร�ิ�หรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "�ำห��ว�า�ะ�ลื�อ�มุมมอ���ือ��ีละสั��าห�����าร�ลื�อ��ีละ��ือ�หรือ�ม�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "�ำห��ว�า�ะ�ั����า��ือ��วาม�ำ�ริยายสำหรั��ั�หมายหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "�ำห��ว�า�ส����อ���อมูล�ารร�อ��อ�าร�อ��ลั�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูลหมว�หมู�����รื�อ�มือ������ห�ุ�าร��/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูล���า�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูลส�า�ะ����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 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:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูล����วลา����รื�อ�มือ������ห�ุ�าร��/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "�ำห��ว�า�ส����อ���อมูล��ิ�����รื�อ�มือ������ห�ุ�าร��/ภาร�ิ�/�าร�ระ�ุมหรือ�ม�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../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:99
+#: ../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:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "�ำห��ว�า�ะ����าร�รั��วลาห��าร�อ���ะ�ส���ห�ุ�าร����า�� หรือ�ม�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "�ั�ว�ม�สิ��สุ�วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "�า�ีสิ��สุ�วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "�ั�ว�ม��ริ�ม���วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "�า�ี�ริ�ม���วั��ำ�า�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "�รั��วลาห��าร�อ�"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Summary contains"
-msgstr "สรุ�มี�ำว�า"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Description contains"
-msgstr "�ำอ�ิ�ายมี�ำว�า"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Category is"
-msgstr "อยู���หมว�"
+#: ../calendar/gui/cal-editor-utils.c:105
+msgid "Invalid object"
+msgstr "อ�อ�������ม��ู���อ�"
 
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Comment contains"
-msgstr "มี�วาม�ิ��ห��"
-
-#: ../calendar/gui/cal-search-bar.c:79
-msgid "Location contains"
-msgstr "ส�า��ี�มี�ำว�า"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Next 7 Days' Tasks"
-msgstr "ภาร�ิ��อ� 7 วั���า�ห��า"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Active Tasks"
-msgstr "ภาร�ิ��ี��ำลั��ำอยู�"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Overdue Tasks"
-msgstr "ภาร�ิ��ี��ลย�ำห��"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Completed Tasks"
-msgstr "ภาร�ิ��ี��สร���ล�ว "
-
-#: ../calendar/gui/cal-search-bar.c:656
-msgid "Tasks with Attachments"
-msgstr "ภาร�ิ��ี�มี���ม���"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Active Appointments"
-msgstr "�ั�หมาย�ี�มี�ลอยู�"
-
-#: ../calendar/gui/cal-search-bar.c:706
-msgid "Next 7 Days' Appointments"
-msgstr "�ั�หมาย�อ� 7 วั���า�ห��า"
-
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "�ิม��"
-
-#: ../calendar/gui/calendar-commands.c:315
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"��ิ�ั�ิ�าร�ี��ะล��ห�ุ�าร���ุ�อย�า��ี����า�ว�า�วลา�ี��ำห���ว� หา��ุ��ำ��ิ��าร��อ�� "
-"�ะ�ม�สามาร��รีย���อมูล�ห�ุ�าร���หล�า�ี�����ลั��ื�มา���อี�"
-
-#: ../calendar/gui/calendar-commands.c:321
-msgid "Purge events older than"
-msgstr "ล��ห�ุ�าร���ี����า�ว�า"
-
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "วั�"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
-#. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
-msgid "On The Web"
-msgstr "���ว��"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "วั���ิ� & วั��ร�รอ��ี"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "ราย�า�อา�าศ"
-
-#: ../calendar/gui/calendar-component.c:676
-msgid "_New Calendar"
-msgstr "��ิ�ิ��_หม�"
-
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
-msgid "_Copy..."
-msgstr "_�ั�ลอ�..."
-
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
-msgid "_Make available for offline use"
-msgstr "�_�รียม��ื�อ����า�ออ��ล��"
-
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
-msgid "_Do not make available for offline use"
-msgstr "�_ม���อ������ว�����า�ออ��ล��"
-
-#: ../calendar/gui/calendar-component.c:1013
-msgid "Failed upgrading calendars."
-msgstr "�าร�รั��รุ�รุ����ิ�ิ�ล�ม�หลว"
-
-#: ../calendar/gui/calendar-component.c:1142
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "�ม�สามาร���ิ���ิ�ิ� '%s' ��ื�อ�ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
-
-#: ../calendar/gui/calendar-component.c:1158
-msgid "There is no calendar available for creating events and meetings"
-msgstr "�ม�มี��ิ�ิ��ี��ะ������สำหรั��ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
-
-#: ../calendar/gui/calendar-component.c:1271
-msgid "Calendar Source Selector"
-msgstr "��อ��ลือ��หล����ิ�ิ�"
-
-#: ../calendar/gui/calendar-component.c:1487
-msgid "New appointment"
-msgstr "�ั�หมาย�หม�"
-
-#: ../calendar/gui/calendar-component.c:1488
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_�ั�หมาย"
-
-#: ../calendar/gui/calendar-component.c:1489
-msgid "Create a new appointment"
-msgstr "สร�า��ั�หมาย�หม�"
-
-#: ../calendar/gui/calendar-component.c:1495
-msgid "New meeting"
-msgstr "�าร�ระ�ุม�หม�"
-
-#: ../calendar/gui/calendar-component.c:1496
-msgctxt "New"
-msgid "M_eeting"
-msgstr "�าร_�ระ�ุม"
-
-#: ../calendar/gui/calendar-component.c:1497
-msgid "Create a new meeting request"
-msgstr "สร�า��าร�อ�าร�ระ�ุม�หม�"
-
-#: ../calendar/gui/calendar-component.c:1503
-msgid "New all day appointment"
-msgstr "�ั�หมาย�ลอ��ั��วั��หม�"
-
-#: ../calendar/gui/calendar-component.c:1504
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "�ั�หมาย_�ลอ��ั��วั�"
-
-#: ../calendar/gui/calendar-component.c:1505
-msgid "Create a new all-day appointment"
-msgstr "สร�า��าร�ระ�ุม�ลอ��ั��วั��หม�"
-
-#: ../calendar/gui/calendar-component.c:1511
-msgid "New calendar"
-msgstr "��ิ�ิ��หม�"
-
-#: ../calendar/gui/calendar-component.c:1512
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "_��ิ�ิ�"
-
-#: ../calendar/gui/calendar-component.c:1513
-msgid "Create a new calendar"
-msgstr "สร�า���ิ�ิ��หม�"
-
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "มุมมอ�วั�"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "มุมมอ�สั��าห��ำ�า�"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "มุมมอ�สั��าห�"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "มุมมอ���ือ�"
 
@@ -5519,21 +3000,22 @@ msgid "Category"
 msgstr "หมว�"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "�ระ�ภ�"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../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
-#: ../plugins/plugin-manager/plugin-manager.c:59
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "�ำ�รรยาย"
 
@@ -5552,35 +3034,43 @@ msgstr "�ม�มี"
 msgid "Exist"
 msgstr "มี"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../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
+msgid "Location"
+msgstr "ส�า��ี�"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "�ู��ระสา��า�"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ส�ว��ัว"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "��ิ���ย"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../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:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../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
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "สรุ�"
 
@@ -5600,504 +3090,511 @@ msgid "does not contain"
 msgstr "�ม�มี�ำว�า"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "�ือ"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "�ม����"
 
-#: ../calendar/gui/comp-editor-factory.c:409
-msgid "Error while opening the calendar"
-msgstr "��ิ���อ�ิ��ลา���ะ��ิ���ิ�ิ�"
-
-#: ../calendar/gui/comp-editor-factory.c:415
-msgid "Method not supported when opening the calendar"
-msgstr "�รีย��ม�อ��ี��ม�รอ�รั���ะ��ิ���ิ�ิ�"
-
-#: ../calendar/gui/comp-editor-factory.c:421
-msgid "Permission denied to open the calendar"
-msgstr "�ม�อ�ุ�า��ห���ิ���ิ�ิ�"
-
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
-msgid "Unknown error"
-msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:607
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "������าร��ือ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>��ือ�</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "�ุ���อ�วาม��ือ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>�ัว�ลือ�</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "�ล���สีย�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "�รีย���ร��รม"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>��ำ</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "ส��อี�มล"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "��ิ�ม�าร��ือ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "�าร��ือ�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "��อ�วาม�_ลือ��อ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "�สีย���ือ��ลือ��อ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "_��อ�วาม:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "�ล���สีย�"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "�ุ���อ�วาม��ือ�"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "�ัว�ลือ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "�รีย���ร��รม"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "��ำ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "�ลือ����ม"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "ส����ยั�:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "ส��อี�มล"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "_อาร��ิว�ม���:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "�_�ร��รม:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "��ือ�_��ำ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "�_สีย�:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "after"
 msgstr "หลั��า�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "before"
 msgstr "��อ�"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
 msgstr "วั�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#. 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
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "days"
+msgstr "วั�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "สิ��สุ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "�รั����ิ�ม��ิม�ุ��"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "hour(s)"
 msgstr "�ั�ว�ม�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "minute(s)"
 msgstr "�า�ี"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 msgid "start of appointment"
 msgstr "�ริ�ม�ั�หมาย"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "��ิ�ั�ิ�าร/�ารสะ�ิ�"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "�_�ิ�ม"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "�าร��ือ�"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
-msgid "_Suggest automatic display of attachment"
-msgstr "�ห��_ส�����ม����ี���ยอั���มั�ิ"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
-msgid "Attach file(s)"
-msgstr "������ม"
-
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1727
-#: ../widgets/misc/e-signature-combo-box.c:74
+#. 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/e-day-view-time-item.c:797
+msgctxt "cal-second-zone"
 msgid "None"
-msgstr "�ม�"
+msgstr "�ม�มี"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:343
+msgid "Select..."
+msgstr "�_ลือ�..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "��ิ�ิ��ี��ลือ���ื�อ���������ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(�ส����มุมมอ�วั�)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
+msgid "Time and date:"
+msgstr "วั��ี��ละ�วลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 �า�ี\n"
-"30 �า�ี\n"
-"15 �า�ี\n"
-"10 �า�ี\n"
-"05 �า�ี"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
+msgid "Date only:"
+msgstr "วั��ี�อย�า���ียว:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u �ละ %d �ะ�ู�����ี���วย�ื�อ�ู�����ละ���ม��า��ี�อยู�อี�มล</i>"
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u �ละ %d �ะ�ู�����ี���วย�ื�อ�ู�����ละ���ม��า��ี�อยู�อี�มล"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(�ส����มุมมอ�วั�)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">�าร�����ห�ุ</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 �า�ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">��ิร���วอร�ส�า�ะว�า�/�ม�ว�า��ริยาย</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 �า�ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">�ั�ว��</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 �า�ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">ราย�ารภาร�ิ�</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 �า�ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">�วลา</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 �า�ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">สั��าห��ำ�า�</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "�าร������ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "�รั��วลาห��า_ร�อ�"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "รู����วั��ี�/�วลา"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "สิ��สุ�วั_�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "วั�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "��ิร���วอร�ส�า�ะว�า�/�ม�ว�า��ริยาย"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "�ส��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
+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/e-itip-control.c:738
 msgid "Friday"
 msgstr "ศุ�ร�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"�า�ี\n"
-"�ั�ว�ม�\n"
-"วั�"
+#: ../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
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "General"
+msgstr "�ั�ว��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "�ั�ว�ม�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "�า�ี"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "�ั��ร�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"วั��ั��ร�\n"
-"วั�อั��าร\n"
-"วั��ุ�\n"
-"วั��ฤหัส��ี\n"
-"วั�ศุ�ร�\n"
-"วั��สาร�\n"
-"วั�อา�ิ�ย�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "�ม�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "�ลือ�สี"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "อ_า."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "�สาร�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "�_ลื�อ�มุมมอ���ือ��ีละสั��าห�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "����วลา�ี�สอ_�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "�ลือ���ิ�ิ�สำหรั��าร������ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "�_�ือ��วาม�ำ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "��ือ�_�วาม�ำ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "�ส��สั�_�าห��ี�����ิ�ิ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../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.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "อา�ิ�ย�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "_ภาร�ิ��ี��ึ��ำห��วั��ี�"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "�_ฤ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "ราย�ารภาร�ิ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "รู������อ�วาม:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "�ฤหัส��ี"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
+msgid "Time"
+msgstr "�วลา"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "�_���วลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "รู�����วลา:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "อั��าร"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+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/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "�ุ�"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "�ริ�ม���สั_��าห��ี�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+msgid "Work Week"
+msgstr "สั��าห��ำ�า�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "วั��ำ�า�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 �ั�ว�ม� (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 �ั�ว�ม�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_�าม��ื�อ�ารยื�ยั���ะล�ราย�าร"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "_�ระ�ั�วั�สุ�สั��าห���มุมมอ���ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "�ริ�ม���_วั�:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "_ศ."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "_��อ�ภาร�ิ��ี��สร���ล�วหลั��า�"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "_�."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "ภาร�ิ��ี��_ลย�ำห��:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "_ส."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "�_ส���วลาสิ��สุ��ั�หมาย��มุมมอ�สั��าห��ละ��ือ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "�าร_�ำ����วลา:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "_อ."
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "_�."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "��อ�วั��ร�รอ�/วั���ิ��ุ��รั��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "��อ��ั�หมาย�ุ��รั��"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "��ิ�:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:500
+msgid "_Type:"
+msgstr "�_�ิ�:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../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
+msgid "_Name:"
+msgstr "_�ื�อ:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "�ั�ลอ_���ื�อหา��ิ�ิ��ว��ี���รื�อ���ื�อ�าร�ำ�า����ออ��ล��"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "�ั�ลอ_���ื�อหาราย�ารภาร�ิ��ว��ี���รื�อ���ื�อ�าร�ำ�า����ออ��ล��"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "�ั�ลอ_���ื�อหาราย�าร�ั��ึ���วย�ำ�ว��ี���รื�อ���ื�อ�าร�ำ�า����ออ��ล��"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "_สี:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
-msgstr "ราย�ารภาร�ิ�"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "ราย�าร�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "�ุ�สม�ั�ิ��ิ�ิ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "��ิ�ิ��หม�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "�ุ�สม�ั�ิราย�ารภาร�ิ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "ราย�ารภาร�ิ��_หม�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "�ุ�สม�ั�ิราย�าร�ั��ี���วย�ำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "ราย�าร�ั��ึ���วย�ำ�หม�"
 
@@ -6151,313 +3648,268 @@ msgstr "%s  �ุ��ม�����������อมูล��
 msgid "Validation error: %s"
 msgstr "����อ�ิ��ลา��อ���อมูล: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " �ึ� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr "(�สร�� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "�สร�� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr " (�ำห���สร�� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "�ำห���สร�� "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "��อ�วาม�ี����มา - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "��อ�วาม�ี����มา"
-msgstr[1] "��อ�วาม�ี����มา %d ��อ�วาม"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "_ย�าย"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2075
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "ย��ลิ��าร_ลา�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3316 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:456
-msgid "attachment"
-msgstr "���ม���"
+#: ../calendar/gui/dialogs/comp-editor.c:247
+msgid "Could not save attachments"
+msgstr "�ม�สามาร��ั��ึ����ม���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:515
 msgid "Could not update object"
 msgstr "�ม�สามาร��รั���อมูลอ�อ������"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:614
 msgid "Edit Appointment"
 msgstr "������ั�หมาย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Meeting - %s"
 msgstr "�าร�ระ�ุม - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:623
 #, c-format
 msgid "Appointment - %s"
 msgstr "�ั�หมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:629
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ภาร�ิ��ี����รั�มอ�หมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:631
 #, c-format
 msgid "Task - %s"
 msgstr "ภาร�ิ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:636
 #, c-format
 msgid "Memo - %s"
 msgstr "�ั��ึ���วย�ำ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:652
 msgid "No Summary"
 msgstr "�ม�มีสรุ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:761
 msgid "Keep original item?"
 msgstr "�ะ����ราย�าร�����ั��ว�หรือ�ม�?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:948
 msgid "Click here to close the current window"
 msgstr "�ลิ��ี��ี���ื�อ�ิ�ห��า��า��ั��ุ�ั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
-msgid "Copy selected text to the clipboard"
-msgstr "�ั�ลอ���อ�วาม�ี��ลือ����า�ลิ��อร��"
+#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1460
+#: ../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
+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
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "�ั�ส�ว��ี��ลือ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-msgid "Cut selected text to the clipboard"
-msgstr "�ั���อ�วาม�ี��ลือ����า�ลิ��อร��"
+#: ../calendar/gui/dialogs/comp-editor.c:969
+#: ../shell/e-shell-window-actions.c:1474
+#: ../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:1333
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "Click here to view help available"
 msgstr "�ลิ��ี��ี���ื�อ�ูวิ�ี���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
-msgid "Paste text from the clipboard"
-msgstr "��ะ��อ�วาม�า��ลิ��อร��"
+#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1509
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "��ะ�า��ลิ��อร��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1004
 msgid "Click here to save the current window"
 msgstr "�ลิ��ี��ี���ื�อ�ั��ึ�ห��า��า��ั��ุ�ั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1579
+#: ../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:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1018
 msgid "_Classification"
 msgstr "�ระ�_ภ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1628
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "�_��ม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_Help"
 msgstr "_วิ�ี���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1046
 msgid "_Insert"
 msgstr "�_�ร�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "_�ัว�ลือ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "มุ_มมอ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "���ม�_��..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Click here to attach a file"
 msgstr "�ลิ��ี��ี���ื�อ������ม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "_Categories"
 msgstr "_หมว�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 msgid "Toggles whether to display categories"
 msgstr "��อ�/�ส����อ���อมูลหมว�หมู�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 msgid "Time _Zone"
 msgstr "�_���วลา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "Toggles whether the time zone is displayed"
 msgstr "��อ�/�ส����อ���อมูล����วลา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1099
 msgid "Pu_blic"
 msgstr "�_�ิ���ย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Classify as public"
 msgstr "�ำห�������ระ�ภ���ิ���ย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 msgid "_Private"
 msgstr "ส�ว�_�ัว"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1108
 msgid "Classify as private"
 msgstr "�ำห�������ระ�ภ�ส�ว��ัว"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "_Confidential"
 msgstr "�����วาม_ลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Classify as confidential"
 msgstr "�ำห�������ระ�ภ��วามลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "R_ole Field"
 msgstr "��อ���อมูล_���า�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the Role field is displayed"
 msgstr "��อ�/�ส����อ���อมูล���า�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "_RSVP"
 msgstr "_�ารร�อ��อ�าร�อ��ลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1133
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "��อ�/�ส����อ���อมูล�ารร�อ��อ�าร�อ��ลั�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "_Status Field"
 msgstr "��อ���อมูล_ส�า�ะ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Toggles whether the Status field is displayed"
 msgstr "��อ�/�ส����อ���อมูลส�า�ะ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "_Type Field"
 msgstr "��อ���อมูล_��ิ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1149
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "��อ�/�ส����ิ��ู����า�ระ�ุม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "�อ�สาร_ล�าสุ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1693
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "���ม��� <b>%d</b> ���ม"
-msgstr[1] "���ม��� <b>%d</b> ���ม"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "��อ��_�����ม���"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "�ส���_�����ม���"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_ล�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "�_�ิ�ม���ม���..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "�ส�����ม���"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "����ร��ว��วรร���ื�อ��อ�/�ส��������ม���"
+#: ../calendar/gui/dialogs/comp-editor.c:1748
+msgid "Save"
+msgstr "�ั��ึ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3349
+#: ../calendar/gui/dialogs/comp-editor.c:2025
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2965
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "�วาม��ลี�ย���ล���ราย�าร�ี�อา��ู�ละ�ลย��ามี�าร�รั���อมูล���ามา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3378
+#: ../calendar/gui/dialogs/comp-editor.c:2933
+#: ../plugins/prefer-plain/prefer-plain.c:67
+msgid "attachment"
+msgstr "���ม���"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2995
 msgid "Unable to use current version!"
 msgstr "�ม�สามาร����รุ���ั��ุ�ั�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "�ม�สามาร���ิ��หล�����"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "�ม�สามาร���ิ��ี��ลาย�า�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "�ี��ลาย�า����อ�า�������า�ั��"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_ล�ราย�าร�ี�ออ��า��ล�อ���หมาย�อ��ู�รั�อื���ั��หม�หรือ�ม�?"
 
@@ -6509,283 +3961,294 @@ msgstr "�ม�สามาร�ล��ั��ึ���วย�ำ�
 msgid "The item could not be deleted due to an error"
 msgstr "�ม�สามาร�ล�ราย�าร��� ��ราะ��ิ���อ�ิ��ลา��า��ระ�าร"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
-msgstr "�ี�อยู��ิ���อ..."
+msgstr "�ู��ิ���อ..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "มอ��ั��ะ�ห�:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "��อ��ู�รั�มอ��ั��ะ"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "�าร�_�ือ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "�ลิ��ี��ี���ื�อ�ำห��หรือย��ลิ��าร������ือ��อ��ห�ุ�าร���ี�"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "�าร�_วีย���ำ"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "�ำ�ห������ห�ุ�าร���วีย���ำ"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "�ัว�ลือ��อ��ารส��"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "��ร��ัว�ลือ��ั��สู��อ��ารส��"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "�ห�ุ�าร��_�ลอ�วั�"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "�ลือ��ห�มี/�ม�มี�ห�ุ�าร���ลอ�วั�"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "�ส���วลาว�า�_ม�ว�า�"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "�ลือ��ส���วลา����ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "_ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "สอ��าม��อมูล�ารว�า�/�ม�ว�า��อ��ู����า�ระ�ุม"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "_�ั�หมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:751
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "�ม�สามาร�������ห�ุ�าร����� ��ราะ��ิ�ิ��ี��ลือ�สามาร�อ�า����อย�า���ียว"
+
+#: ../calendar/gui/dialogs/event-page.c:755
+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
 msgid "This event has alarms"
 msgstr "�ห�ุ�าร���ี�มี�าร������ือ�"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../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:845
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "�ู�_รั��ั��ะ"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "�ู��_��า�ระ�ุม"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "�ห�ุ�าร���ี��ม��อ�วั��ริ�ม���"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "�ห�ุ�าร���ี��ม��อ�วั�สิ��สุ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "วั��ริ�ม����ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "วั�สิ��สุ��ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "�วลา�ริ�ม����ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "�วลาสิ��สุ��ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "�ู��ระสา��า��ี��ลือ��ม�มี�ั��ี�ู����อี��ล�ว"
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "��อ�มี�ู��ระสา��า���วย"
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "��อ��าร�ู����า�ระ�ุมอย�า���อยห�ึ����"
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
-msgid "_Add "
-msgstr "�_�ิ�ม"
-
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2595
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "�ม�สามาร���ิ���ิ�ิ� '%s'"
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. 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
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "�ุ��ำลั��ำ��ิ��าร���าม�อ� %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2941
 #, 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:2931
+#: ../calendar/gui/dialogs/event-page.c:2947
 #, 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:2937
+#: ../calendar/gui/dialogs/event-page.c:2953
 #, 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:2950
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgid "Customize"
 msgstr "�รั�����"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2968
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "1 day before appointment"
 msgstr "1 วั���อ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 hour before appointment"
 msgstr "1 �ั�ว�ม���อ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 msgid "15 minutes before appointment"
 msgstr "15 �า�ี��อ��ั�หมาย"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "�ู����า_�ระ�ุม..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "�ู����า�ระ�ุม"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "�สีย���ือ��ลือ��อ�"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "�ำ�รรยาย�ห�ุ�าร��"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../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.glade.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "�_�����ือ�"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../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.glade.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:356
+msgid "_Location:"
+msgstr "ส�า�_�ี�:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "�_วลา:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "for"
 msgstr "�����ำ�ว�"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
 msgid "until"
 msgstr "�ระ�ั��"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>�ู��_��า�ระ�ุม</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "�_�ลี�ย��ู��ระสา��า�"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "�ี�อยู�_�ิ���อ..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "�ู��ระสา��า�:"
-
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:350
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "�ม�สามาร�������ั��ึ���อ�วาม��� ��ราะราย�าร�ั��ึ���อ�วาม�ี��ลือ�สามาร�อ�า����อย�า���ียว"
+
+#: ../calendar/gui/dialogs/memo-page.c:354
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "�ม�สามาร�������ั��ึ���อ�วาม������ม�ี� ��ราะ�ุ��ม���������ู��ระสา��า�"
+
+#: ../calendar/gui/dialogs/memo-page.c:875
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "�ม�สามาร���ิ��ั��ึ���วย�ำ�� '%s'"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../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
 msgid "To"
 msgstr "�ึ�"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "วั��_ริ�ม���:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_�ึ�:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "�ลุ�_ม:"
 
@@ -6809,37 +4272,37 @@ msgstr "�ุ��ำลั���ลี�ย���ล�ภาร�ิ
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "�ุ��ำลั���ลี�ย���ล��ั��ึ���วย�ำ�วีย���ำ �ุ���อ��าร��ลี�ย���ล�สิ����?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "�ร�ี�ี���ย���าะ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "�ร�ี�ี��ละ��อ�ห��า�ี�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "�ร�ี�ี��ละ��อ��"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "�ุ��ร�ี"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�ั�หมาย�ี�มี�าร�วีย���ำ�ี� Evolution �ม�สามาร���������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "วั��ี��ี��วีย���ำ�ม������า�ี�������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:934
 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:961
+#: ../calendar/gui/dialogs/recurrence-page.c:963
 msgid "on"
 msgstr "��"
 
@@ -6847,7 +4310,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1020
 msgid "first"
 msgstr "วั��ร�"
 
@@ -6856,7 +4319,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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "second"
 msgstr "วั��ี�สอ�"
 
@@ -6864,7 +4327,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:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "third"
 msgstr "วั��ี�สาม"
 
@@ -6872,10 +4335,18 @@ 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:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fourth"
 msgstr "วั��ี�สี�"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (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
+msgid "fifth"
+msgstr "วั��ี�ห�า"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (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.
@@ -6886,7 +4357,7 @@ 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:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "Other Date"
 msgstr "วั�อื��"
 
@@ -6894,7 +4365,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1076
 msgid "1st to 10th"
 msgstr "วั��ี� 1 �ึ�วั��ี� 10"
 
@@ -6902,7 +4373,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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "11th to 20th"
 msgstr "วั��ี� 11 �ึ�วั��ี� 20"
 
@@ -6910,245 +4381,252 @@ 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:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 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:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1242
 msgid "on the"
-msgstr "�มื�อ"
+msgstr "��"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "�รั��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2122
 msgid "Add exception"
 msgstr "��ิ�ม��อย��ว��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2163
 msgid "Could not get a selection to modify."
 msgstr "�ม�สามาร�อ�า�ส�ว��ี��ลือ���ื�อ��������"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2169
 msgid "Modify exception"
 msgstr "�������อย��ว��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2213
 msgid "Could not get a selection to delete."
 msgstr "�ม�สามาร�อ�า�ส�ว��ี��ลือ���ื�อล����"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2352
 msgid "Date/Time"
 msgstr "วั�/�วลา"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>��อย��ว��</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>�ส���ัวอย�า�</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>�าร�วีย���ำ</b>"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "�ุ�� "
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "��อย��ว��"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "�ัวอย�า�"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "�ั�หมาย�ี��_วีย���ำ����รอ��"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
 msgid "forever"
 msgstr "�ลอ���"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "month(s)"
 msgstr "��ือ�"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "week(s)"
 msgstr "สั��าห�"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
 msgid "year(s)"
 msgstr "�ี"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "ส���าร������ือ��อ���า����า���ั��ห�ุ�าร���ี���วย"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr "�����ู����า�ระ�ุมราย�ห_ม����า�ั��"
+
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "วั��ี��สร���ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "�ว�����"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">������ล��</span>"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">ส�า�ภา�</span>"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
+#. 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
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "�สร���ล�ว"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
+#. 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
 msgid "High"
 msgstr "สู�"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
+#. 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
 msgid "In Progress"
 msgstr "�ำลั��ำ��ิ��าร"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
+#. 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
 msgid "Low"
 msgstr "��ำ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1007 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
+#. 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:1304 ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "���ิ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
+#. 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
 msgid "Not Started"
 msgstr "ยั��ม��ริ�ม"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "�_�อร��������า��ี��สร��:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "_ส�า�ะ:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. 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-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+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
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "�ม�����ำห��"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_วั��ี��ำ�สร��:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "_ระ�ั��วามสำ�ั�:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "�_ว�����:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "รายละ�อีย�_ส�า�ะ"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "�ลิ���ื�อ�ูหรือ��ลี�ย�รายละ�อีย�ส�า�ะ�อ�ภาร�ิ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "�ัว�_ลือ��อ��ารส��"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "_ภาร�ิ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "รายละ�อีย�ภาร�ิ�"
 
-#: ../calendar/gui/dialogs/task-page.c:373
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "�ม�สามาร������ภาร�ิ���� ��ราะราย�ารภาร�ิ��ี��ลือ�สามาร�อ�า����อย�า���ียว"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+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.ui.h:4
 msgid "Organi_zer:"
 msgstr "�ู��ระ_สา��า�:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "วั��ำห���สร���า��ม��ู���อ�"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "�ม�สามาร���ิ�ภาร�ิ��� '%s'"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "�ู��_��า�ระ�ุม..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "ห_มว�..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "วั��ำห_���สร��:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "����วลา:"
 
@@ -7228,80 +4706,82 @@ msgstr "%s �ี� %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s สำหรั��ารสะ�ิ��ี��ม��รา���ิ�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
-#, c-format
-msgid "Click to open %s"
-msgstr "�ลิ���ื�อ��ิ� %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "�ม�มี�ื�อ�รื�อ�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
-msgid "Start Date:"
-msgstr "วั��ริ�ม���:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Description:"
-msgstr "�ำอ�ิ�าย:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "�ว�����:"
+#: ../calendar/gui/e-cal-component-preview.c:198
+msgid "Categories:"
+msgstr "หมว�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "สรุ�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
+msgid "Start Date:"
+msgstr "วั��ริ�ม���:"
+
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "วั��ำห���สร��:"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "Status:"
 msgstr "ส�า�ะ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:312
 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
+msgid "Description:"
+msgstr "�ำอ�ิ�าย:"
+
+#: ../calendar/gui/e-cal-component-preview.c:368
+msgid "Web Page:"
+msgstr "ห��า�ว��:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:368
+msgid "Created"
+msgstr "สร�า�"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "วั�สิ��สุ�"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../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-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "วั��ริ�ม���"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-task-table.c:560
 msgid "Free"
 msgstr "ว�า�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "�ม�ว�า�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7311,234 +4791,77 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../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
 msgid "Yes"
 msgstr "��ล�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../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
 msgid "No"
 msgstr "�ม���ล�"
 
+#: ../calendar/gui/e-cal-model.c:377
+msgid "Default Client"
+msgstr "��ร��รมลู���าย�ริยาย"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:551
+#: ../shell/e-shell.c:868
+msgid "Shell Settings"
+msgstr "��า�ั����ลล�"
+
+#: ../calendar/gui/e-cal-model.c:388 ../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:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
+#: ../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
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:827
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
-msgstr "�ม�รู��ั�"
+msgstr "�ม��รา�"
 
-#: ../calendar/gui/e-cal-model.c:1009
+#: ../calendar/gui/e-cal-model.c:1306
 msgid "Recurring"
 msgstr "�วีย���ำ"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../calendar/gui/e-cal-model.c:1308
 msgid "Assigned"
 msgstr "มอ�หมาย"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "�ั��ึ�����..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "�ลือ���ล��อร��ี��ะ�ั��ึ����ม����ี��ลือ�..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
+#: ../calendar/gui/e-cal-model.c:2210
 #, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "_�ั��ึ�����..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "�ั������_�ื��หลั�"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "_�ั��ึ�สิ���ี��ลือ�"
-
-#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:827
-#, c-format
-msgid "Open in %s..."
-msgstr "��ิ��� %s..."
-
-#: ../calendar/gui/e-calendar-table.c:336
-msgid "* No Summary *"
-msgstr "* �ม�มีสรุ� *"
-
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "�ู��ระสา��า�: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2441
-#, c-format
-msgid "Organizer: %s"
-msgstr "�ู��ระสา��า�: %s"
-
-#: ../calendar/gui/e-calendar-table.c:406
-msgid "Start: "
-msgstr "�ริ�ม: "
-
-#: ../calendar/gui/e-calendar-table.c:418
-msgid "Due: "
-msgstr "�ำห���สร��: "
-
-#: ../calendar/gui/e-calendar-table.c:610
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:611
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:612
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:613
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:614
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:615
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:616
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:617
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:618
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:619
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:620
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
-msgid "Deleting selected objects"
-msgstr "�ำลั�ล�วั��ุ�ี��ลือ�"
-
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
-msgid "Updating objects"
-msgstr "�ำลั��รั���อมูลออ���������า��"
-
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
-msgid "Save as..."
-msgstr "�ั��ึ�����..."
-
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
-msgid "New _Task"
-msgstr "ภาร�ิ��_หม�"
-
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
-msgid "Open _Web Page"
-msgstr "��ิ�_�ว�����"
-
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
-msgid "P_rint..."
-msgstr "_�ิม��..."
-
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "_�ั�"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "�_�ะ"
-
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "_มอ�หมายภาร�ิ�"
-
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "ส��_��อ���� iCalendar"
-
-#: ../calendar/gui/e-calendar-table.c:1613
-msgid "_Mark as Complete"
-msgstr "_�ำ��รื�อ�หมายว�า�สร���ล�ว"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Mark Selected Tasks as Complete"
-msgstr "_�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�า�สร���ล�ว"
-
-#: ../calendar/gui/e-calendar-table.c:1615
-msgid "_Mark as Incomplete"
-msgstr "_�ำ��รื�อ�หมายว�ายั��ม��สร��"
-
-#: ../calendar/gui/e-calendar-table.c:1616
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�ายั��ม��สร��"
-
-#: ../calendar/gui/e-calendar-table.c:1621
-msgid "_Delete Selected Tasks"
-msgstr "ล�_ภาร�ิ��ี��ลือ�"
-
-#: ../calendar/gui/e-calendar-table.c:1858
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "�ลิ���ื�อ��ิ�มภาร�ิ�"
+msgid "Opening %s"
+msgstr "�ำลั���ิ� %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% �วามสม�ูร��"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "�ลิ���ื�อ��ิ�มภาร�ิ�"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "�สร���ล�ว"
@@ -7547,167 +4870,127 @@ msgstr "�สร���ล�ว"
 msgid "Completion date"
 msgstr "วั��ี��า��สร��"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "วั��ำห���สร��"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "ระ�ั��วามสำ�ั�"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "วั��ริ�ม���"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "ส�า�ะ"
-
-#: ../calendar/gui/e-calendar-view.c:1482
-msgid "Moving items"
-msgstr "�ำลั�ย�ายราย�าร"
-
-#: ../calendar/gui/e-calendar-view.c:1484
-msgid "Copying items"
-msgstr "�ำลั��ั�ลอ�ราย�าร"
-
-#: ../calendar/gui/e-calendar-view.c:1793
-msgid "New _Appointment..."
-msgstr "�ั�หมาย�_หม�"
-
-#: ../calendar/gui/e-calendar-view.c:1794
-msgid "New All Day _Event"
-msgstr "�_ห�ุ�าร���ั��วั�ราย�าร�หม�"
-
-#: ../calendar/gui/e-calendar-view.c:1795
-msgid "New _Meeting"
-msgstr "�าร�ระ�ุม�_หม�"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
-msgid "_Current View"
-msgstr "_มุมมอ��ั��ุ�ั�"
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Select T_oday"
-msgstr "�ลือ�_วั��ี�"
-
-#: ../calendar/gui/e-calendar-view.c:1809
-msgid "_Select Date..."
-msgstr "�_ลือ�วั�..."
-
-#: ../calendar/gui/e-calendar-view.c:1815
-msgid "Pri_nt..."
-msgstr "�ิ_ม��..."
-
-#: ../calendar/gui/e-calendar-view.c:1825
-msgid "Cop_y to Calendar..."
-msgstr "_�ั�ลอ���ยั���ิ�ิ�..."
-
-#: ../calendar/gui/e-calendar-view.c:1826
-msgid "Mo_ve to Calendar..."
-msgstr "_ย�าย��ยั���ิ�ิ�..."
-
-#: ../calendar/gui/e-calendar-view.c:1827
-msgid "_Delegate Meeting..."
-msgstr "มอ�หมาย�ระ�ุม�_��..."
-
-#: ../calendar/gui/e-calendar-view.c:1828
-msgid "_Schedule Meeting..."
-msgstr "_�ั��วลา�ระ�ุม..."
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../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
+msgid "Type"
+msgstr "��ิ�"
 
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "_Forward as iCalendar..."
-msgstr "ส��_��อ���� iCalendar..."
+#: ../calendar/gui/e-calendar-view.c:392
+msgid "Cut selected events to the clipboard"
+msgstr "�ั��ห�ุ�าร���ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-calendar-view.c:1830
-msgid "_Reply"
-msgstr "_�อ��ลั�"
+#: ../calendar/gui/e-calendar-view.c:398
+msgid "Copy selected events to the clipboard"
+msgstr "�ั�ลอ��ห�ุ�าร���ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-calendar-view.c:1831 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Reply to _All"
-msgstr "�อ��ลั��ั��ห_ม�"
+#: ../calendar/gui/e-calendar-view.c:404
+msgid "Paste events from the clipboard"
+msgstr "��ะ�ห�ุ�าร���า��ลิ��อร��"
 
-#: ../calendar/gui/e-calendar-view.c:1836
-msgid "Make this Occurrence _Movable"
-msgstr "�ห��ห�ุ�าร���ี��_�ลื�อ�ย�าย���"
+#: ../calendar/gui/e-calendar-view.c:410
+msgid "Delete selected events"
+msgstr "ล��ห�ุ�าร���ี��ลือ�"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "_ล��ห�ุ�าร���ี�"
+#: ../calendar/gui/e-calendar-view.c:429 ../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:1838
-msgid "Delete _All Occurrences"
-msgstr "ล�_�ุ��ห�ุ�าร��"
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-task-table.c:1063
+msgid "Updating objects"
+msgstr "�ำลั��รั���อมูลอ�อ��������า��"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../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
 msgid "Accepted"
 msgstr "�อ�รั��ล�ว"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-itip-control.c:1194
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../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
 msgid "Declined"
 msgstr "��ิ�ส�"
 
-#: ../calendar/gui/e-calendar-view.c:2294
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-view.c:1692
+#: ../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
 msgid "Tentative"
 msgstr "�ม����"
 
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-calendar-view.c:1693
+#: ../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
 msgid "Delegated"
 msgstr "ส���ู�������า�ระ�ุม"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:1694
 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
+#, 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "�ู��ระสา��า�: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "ส�า��ี�: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2491
+#: ../calendar/gui/e-calendar-view.c:1886
 #, c-format
 msgid "Time: %s %s"
 msgstr "�วลา: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Ey %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Ey %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7720,12 +5003,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "�วามละ�อีย� %02i �า�ี"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "�ส������วลา�ี�สอ�"
 
@@ -7735,48 +5018,73 @@ 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:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %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:1901
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:907
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. 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:1917
+#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:943
+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:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:1115 ../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:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:1118 ../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:2321
+#: ../calendar/gui/e-day-view.c:2614
 #, c-format
 msgid "Week %d"
 msgstr "สั��าห��ี� %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "��� (�าร�วีย���ำ����ั���อ�)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "�ุ�วั�"
 msgstr[1] "�ุ� %d วั�"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "�ุ�สั��าห�"
 msgstr[1] "�ุ� %d สั��าห�"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7784,35 +5092,35 @@ msgstr[0] "�ุ�สั��าห���วั�"
 msgstr[1] "�ุ� %d สั��าห���วั�"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr "�ละ"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "วั� %s �อ�"
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s �อ�"
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "�ุ���ือ�"
 msgstr[1] "�ุ� %d ��ือ�"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "�ุ��ี"
 msgstr[1] "�ุ� %d �ี"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7820,422 +5128,429 @@ msgstr[0] "�ั��หม� %d �รั��"
 msgstr[1] "�ั��หม� %d �รั��"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr "สิ��สุ� "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "�ริ�ม"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
 #: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "สิ��สุ�"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "�ึ��ำห��"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "��อมูล iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "��อ�ิ��ลา� iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../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
 msgid "An unknown person"
 msgstr "�ุ��ล�ิร�าม"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1132
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> �รุ�า�ู��อมูล��า�ล�า��ี� �ล�ว�ลือ���ิ�ั�ิ�าร�า��ม�ู��า�ล�า� "
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#. 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
+msgctxt "cal-itip"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
 msgstr "อา��อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "มี�ารสั��ย��ลิ��าร�ระ�ุม ���หา�ม�������ิ�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1279
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "มี�ารสั��ย��ลิ�ภาร�ิ� ���หา�ม�����ราย�ารภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ����ระ�าศ��อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "��อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> �อ�ห� %s ���าร�วม�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> �อ�ห��ุ����าร�วม�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "���า��ร��าร�ระ�ุม"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> ��อ��าร���าร�วม�าร�ระ�ุม�ี�มีอยู�"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "�รั��รุ���อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ��อ��ารรั���อมูล�าร�ระ�ุมล�าสุ�"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "��อ��าร�าร�รั���อมูล�าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ����อ��ลั��ารร�อ��อ��ี�ยว�ั��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "�าร�อ��ลั��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ���ย��ลิ��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "�ารย��ลิ��าร�ระ�ุม"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ���ส����อ�วาม�ี�อ�า��ม����มา�ห�"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "��อ�วาม�าร�ระ�ุม�ิ��ลา�"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ����ระ�าศ��อมูล�อ�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "��อมูลภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> �อ�ห� %s ��ิ�ั�ิภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> �อ�ห��ุ���ิ�ั�ิภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "��อ�ส�อภาร�ิ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> ��อ��าร���าร�วม��ภาร�ิ��ี�มีอยู�"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "�รั���อมูลภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ��อ��ารรั���อมูลภาร�ิ�ล�าสุ�"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "��อ��าร�าร�รั���อมูลภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ����อ��ลั���ยั��ารมอ�หมายภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "�าร�อ��ลั���ี�ยว�ั�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ���ย��ลิ�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "�ารย��ลิ�ภาร�ิ�"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "��อ�วามภาร�ิ��ิ��ลา�"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ����ระ�าศ��อมูลส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "��อมูล ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ��อ��าร��อมูล ว�า�/�ม�ว�า� �อ��ุ�"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "�ารร�อ��อส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ����อ��ลั��ารร�อ��อ��ี�ยว�ั�ส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "�าร�อ�ส�า�ะว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "��อ�วามส�า�ะว�า�/�ม�ว�า��ิ��ลา�"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "��อ�วาม�ม�อยู���รู�����ี��หมาะสม"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "��อ�วามมี���ราย�ารร�อ��อ�ี��ม�รอ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "���ม����ม�มี��อ�วาม��ิ�ิ��ี�������"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "���ม����ม�มีราย�าร��ิ�ิ��ี�สามาร��ู���"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "�าร�รั���อมูล�สร��สม�ูร��\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
-msgstr "ออ��������ม��ู���อ� �ละ�ม�สามาร��รั���อมูล���\n"
+msgstr "อ�อ�������ม��ู���อ� �ละ�ม�สามาร��รั���อมูล���\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "�ำ�อ��ี��ม����มา�า��ู�ร�วม�ระ�ุม�ั��ุ�ั�  �ะ��ิ�ม���า�����ู�ร�วม�ระ�ุมหรือ�ม�?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "�ม�สามาร��รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม��� ��ื�อ��า�ส�า�ะ������า�ี�����ม����!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "�รั���อมูล�ู����าร�วม�รีย�ร�อย�ล�ว\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "�ม�สามาร��รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม��� ��ื�อ��า�ราย�ารหาย���ล�ว"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "ส��ราย�าร���ล�ว!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "�ม�สามาร�ส��ราย�าร���!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "�ลือ���ิ�ั�ิ�าร:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-itip-control.c:2289
 #: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "�รุ�า�อ��ลั�"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "�รั���อมูล"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "�อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "อา��อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "��ิ�ส�"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "ส����อมูล ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "�รั���อมูลส�า�ะ�าร�อ�รั�"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "ส����อมูลล�าสุ�"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "ย��ลิ�"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--��ยั�--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "��หมาย��ิ�ิ�"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "วั��ี�:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "�ำลั��หล���ิ�ิ�"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "�ำลั��หล���ิ�ิ�..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:7
+msgid "Organizer:"
+msgstr "�ู��ระสา��า�:"
+
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "��อ�วาม�า���ิร���วอร�"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "�ระ�า�"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "�ู����า�ระ�ุมหลั�"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "�ู����า�ระ�ุม�สริม"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "�รั�ยา�ร"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "�ู����า�ระ�ุม"
-
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../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
 msgid "Individual"
 msgstr "ส�ว��ุ��ล"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "�ลุ�ม"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "�รั�ยา�ร"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "ห�อ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "�ระ�า�"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../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
 msgid "Required Participant"
 msgstr "�ู�ร�วม�ระ�ุม�ี���อ����า"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "�ู�ร�วม�ระ�ุม�สริม"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "�ม�����ู�ร�วม�ระ�ุม"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../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
 msgid "Needs Action"
 msgstr "��อ��ำ��ิ��าร"
 
@@ -8244,14 +5559,14 @@ msgstr "��อ��ำ��ิ��าร"
 msgid "Attendee                          "
 msgstr "�ู����าร�วม                           "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2127
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2300
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Ey"
 
@@ -8259,78 +5574,78 @@ msgstr "%A %d %B %Ey"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. 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:471
-#: ../calendar/gui/e-meeting-time-sel.c:2158
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2331
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Ey"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "�ม�อยู��ี��ำ�า�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "�ม�มี��อมูล"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "�ู��_��า�ระ�ุม..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "_�ัว�ลือ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "�ส��_�ั�ว�ม��ำ�าร���า�ั��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "�ส��ภา��ยาย_ออ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "_�รั��รุ���อมูล ว�า�/�ม�ว�า� "
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "�ลือ�_อั���มั�ิ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "_�ุ��� �ุ��รั�ยา�ร"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "�ุ�_�� �ละ�รั�ยา�ร�ิ�����ิ��ห�ึ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "�ู����า�ระ�ุมห_ลั�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "Required people and _one resource"
 msgstr "�ู����า�ระ�ุมหลั� �ละ_�รั�ยา�ร�ิ�����ิ��ห�ึ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:760
 msgid "_Start time:"
 msgstr "�วลา�_ริ�ม���:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:797
 msgid "_End time:"
 msgstr "�วลา_สิ��สุ�:"
 
@@ -8358,182 +5673,376 @@ msgstr "ภาษา"
 msgid "Member"
 msgstr "สมา�ิ�"
 
-#: ../calendar/gui/e-memo-table.c:955
-msgid "_Delete Selected Memos"
-msgstr "ล��ั��ึ�_��วย�ำ�ี��ลือ�"
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../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
+msgid "Memos"
+msgstr "�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+msgid "* No Summary *"
+msgstr "* �ม�มีสรุ� *"
+
+#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+msgid "Start: "
+msgstr "�ริ�ม: "
+
+#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+msgid "Due: "
+msgstr "�ำห���สร��: "
+
+#: ../calendar/gui/e-memo-table.c:707
+msgid "Cut selected memos to the clipboard"
+msgstr "�ั��ั��ึ���วย�ำ�ี��ลือ����า�ลิ��อร��"
+
+#: ../calendar/gui/e-memo-table.c:713
+msgid "Copy selected memos to the clipboard"
+msgstr "�ั�ลอ��ั��ึ���วย�ำ�ี��ลือ����า�ลิ��อร��"
+
+#: ../calendar/gui/e-memo-table.c:719
+msgid "Paste memos from the clipboard"
+msgstr "��ะ�ั��ึ���วย�ำ�า��ลิ��อร��"
+
+#: ../calendar/gui/e-memo-table.c:725
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
+msgid "Delete selected memos"
+msgstr "ล��ั��ึ���วย�ำ�ี��ลือ�"
+
+#: ../calendar/gui/e-memo-table.c:731
+msgid "Select all visible memos"
+msgstr "�ลือ��ั��ึ���วย�ำ�ั��หม��ี�มอ��ห��"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "�ลิ���ื�อ��ิ�ม�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"��ิ���อ�ิ��ลา��ี� %s:\n"
-" %s"
+#: ../calendar/gui/e-task-table.c:530
+msgid "0%"
+msgstr "0%"
 
-#: ../calendar/gui/e-memos.c:812
-msgid "Loading memos"
-msgstr "�ำลั��หล��ั��ึ���วย�ำ"
+#: ../calendar/gui/e-task-table.c:531
+msgid "10%"
+msgstr "10%"
 
-#: ../calendar/gui/e-memos.c:903
-#, c-format
-msgid "Opening memos at %s"
-msgstr "�ำลั���ิ��ั��ึ���วย�ำ�ี� %s"
+#: ../calendar/gui/e-task-table.c:532
+msgid "20%"
+msgstr "20%"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
-msgid "Deleting selected objects..."
-msgstr "�ำลั�ล�สิ���ี��ลือ�..."
+#: ../calendar/gui/e-task-table.c:533
+msgid "30%"
+msgstr "30%"
 
-#: ../calendar/gui/e-tasks.c:963
-msgid "Loading tasks"
-msgstr "�ำลั��หล�ภาร�ิ�"
+#: ../calendar/gui/e-task-table.c:534
+msgid "40%"
+msgstr "40%"
 
-#: ../calendar/gui/e-tasks.c:1061
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "�ำลั���ิ�ภาร�ิ��ี� %s"
+#: ../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-tasks.c:1306
-msgid "Completing tasks..."
-msgstr "�ำลั���ภาร�ิ�..."
+#: ../calendar/gui/e-task-table.c:537
+msgid "70%"
+msgstr "70%"
 
-#: ../calendar/gui/e-tasks.c:1356
-msgid "Expunging"
-msgstr "�ำลั������วา�"
+#: ../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%"
+
+#: ../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
+#: ../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/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "ภาร�ิ�"
+
+#: ../calendar/gui/e-task-table.c:928
+msgid "Cut selected tasks to the clipboard"
+msgstr "�ั�ภาร�ิ��ี��ลือ����า�ลิ��อร��"
+
+#: ../calendar/gui/e-task-table.c:934
+msgid "Copy selected tasks to the clipboard"
+msgstr "�ั�ลอ�ภาร�ิ��ี��ลือ����า�ลิ��อร��"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-task-table.c:940
+msgid "Paste tasks from the clipboard"
+msgstr "��ะภาร�ิ��า��ลิ��อร��"
+
+#: ../calendar/gui/e-task-table.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:680
+msgid "Delete selected tasks"
+msgstr "ล�ภาร�ิ��ี��ลือ�"
+
+#: ../calendar/gui/e-task-table.c:952
+msgid "Select all visible tasks"
+msgstr "�ลือ�ภาร�ิ��ั��หม��ี�มอ��ห��"
+
+#: ../calendar/gui/e-timezone-entry.c:354
 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:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
-msgid "_Custom View"
-msgstr "มุมมอ�_�ำห���อ�"
+#: ../calendar/gui/ea-cal-view-event.c:276
+msgid "It has alarms."
+msgstr "มี�าร��ือ�"
 
-#: ../calendar/gui/gnome-cal.c:2649
-msgid "_Save Custom View"
-msgstr "_�ั��ึ�มุมมอ��ี��ำห���อ�"
+#: ../calendar/gui/ea-cal-view-event.c:279
+msgid "It has recurrences."
+msgstr "มี�าร�วีย���ำ"
 
-#: ../calendar/gui/gnome-cal.c:2654
-msgid "_Define Views..."
-msgstr "_�ำห��มุมมอ�..."
+#: ../calendar/gui/ea-cal-view-event.c:282
+msgid "It is a meeting."
+msgstr "�����าร�ระ�ุม"
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "�ำลั��หล��ั�หมาย�า� %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "��ิ�ิ��ห�ุ�าร��: สรุ��ือ %s"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "Calendar Event: It has no summary."
+msgstr "��ิ�ิ��ห�ุ�าร��: �ม�มีราย�ารสรุ�"
+
+#: ../calendar/gui/ea-cal-view-event.c:312
+msgid "calendar view event"
+msgstr "�ห�ุ�าร���าร�ู��ิ�ิ�"
+
+#: ../calendar/gui/ea-cal-view-event.c:540
+msgid "Grab Focus"
+msgstr "ยึ����ัส"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "�ั�หมาย�หม�"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "�ห�ุ�าร���ลอ��ั��วั��หม�"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "�ระ�ุม�หม�"
+
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "���ี�วั��ี�"
+
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "��ยั�วั��ี�"
+
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
+msgid "a table to view and select the current time range"
+msgstr "�ารา���ื�อ�ู�ละ�ลือ���ว�ระยะ�วลา � �ั��ุ�ั�"
+
+#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "�ำลั��หล�ภาร�ิ��า� %s"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "มี %d �ห�ุ�าร��"
+msgstr[1] "มี %d �ห�ุ�าร��"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+msgid "It has no events."
+msgstr "�ม�มี�ห�ุ�าร��"
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
-msgid "Loading memos at %s"
-msgstr "�ำลั��หล��ั��ึ���วย�ำ�ี� %s"
+msgid "Work Week View: %s. %s"
+msgstr "รายสั��าห��ำ�า�: %s, %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:170
 #, c-format
-msgid "Opening %s"
-msgstr "�ำลั���ิ� %s"
+msgid "Day View: %s. %s"
+msgstr "รายวั�: %s, %s"
+
+#: ../calendar/gui/ea-day-view.c:201
+msgid "calendar view for a work week"
+msgstr "มุมมอ�สำหรั�ห�ึ��สั��าห��ำ�า�"
+
+#: ../calendar/gui/ea-day-view.c:203
+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
+msgid "Gnome Calendar"
+msgstr "��ิ�ิ� Gnome"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+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:209
+#: ../modules/calendar/e-cal-shell-view-private.c:910
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Ey"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../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:240
+#: ../modules/calendar/e-cal-shell-view-private.c:936
+#: ../modules/calendar/e-cal-shell-view-private.c:947
+#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:957
+msgid "%d %b %Y"
+msgstr "%d %b %Ey"
+
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "�ุ�ม�ระ���"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "�ุ�สามาร��ู�ห�ุ�าร��มา��ว�า�ี� ��ย�ลิ��ี��ี�"
+
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "ราย��ือ�: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:161
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "รายสั��าห�: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:192
+msgid "calendar view for a month"
+msgstr "��ิ�ิ�สำหรั�ห�ึ����ือ�"
+
+#: ../calendar/gui/ea-week-view.c:194
+msgid "calendar view for one or more weeks"
+msgstr "��ิ�ิ��ูภาย�� 1 สั��าห� หรือมา��ว�า"
+
+#: ../calendar/gui/gnome-cal.c:2299
 msgid "Purging"
 msgstr "�ำลั������วา�"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.ui.h:1
 msgid "April"
 msgstr "�มษาย�"
 
-#: ../calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.ui.h:2
 msgid "August"
 msgstr "สิ�หา�ม"
 
-#: ../calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.ui.h:3
 msgid "December"
 msgstr "�ั�วา�ม"
 
-#: ../calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.ui.h:4
 msgid "February"
 msgstr "�ุมภา�ั���"
 
-#: ../calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.ui.h:5
 msgid "January"
 msgstr "ม�รา�ม"
 
-#: ../calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.ui.h:6
 msgid "July"
 msgstr "�ร��า�ม"
 
-#: ../calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.ui.h:7
 msgid "June"
 msgstr "มิ�ุ�าย�"
 
-#: ../calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.ui.h:8
 msgid "March"
 msgstr "มี�า�ม"
 
-#: ../calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.ui.h:9
 msgid "May"
 msgstr "�ฤษภา�ม"
 
-#: ../calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.ui.h:10
 msgid "November"
 msgstr "�ฤศ�ิ�าย�"
 
-#: ../calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.ui.h:11
 msgid "October"
 msgstr "�ุลา�ม"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "�ลือ�วั��ี�"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:13
 msgid "September"
 msgstr "�ั�ยาย�"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "�ลือ�_วั��ี�"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "��อ��ำห���ู��ระสา��า���วย"
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "��อ�มี�ู����าร�วม�ระ�ุมอย�า���อยห�ึ����"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
 msgid "Event information"
 msgstr "��อมูล�ห�ุ�าร��"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
 msgid "Task information"
 msgstr "��อมูลภาร�ิ�"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
 msgid "Memo information"
 msgstr "��อมูล�ั��ึ���วย�ำ"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
 msgid "Free/Busy information"
 msgstr "��อมูล ว�า�/�ม�ว�า�"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:645
 msgid "Calendar information"
 msgstr "��อมูล��ิ�ิ�"
 
@@ -8541,7 +6050,7 @@ msgstr "��อมูล��ิ�ิ�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "�อ�รั��ล�ว"
@@ -8550,7 +6059,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:681
+#: ../calendar/gui/itip-utils.c:686
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "อา��อ�รั�"
@@ -8562,7 +6071,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:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "��ิ�ส�"
@@ -8571,7 +6080,7 @@ msgstr "��ิ�ส�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:700
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ส���ู�������า�ระ�ุม"
@@ -8579,7 +6088,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:708
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "��ิ�ม��ิม"
@@ -8587,7 +6096,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:715
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ย��ลิ�"
@@ -8595,7 +6104,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:722
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ล�าสุ�"
@@ -8603,434 +6112,229 @@ 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:729
+#: ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "�ส�อ�ย��"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:804
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "��อมูล ว�า�/�ม�ว�า� (%s ��ยั� %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:812
 msgid "iCalendar information"
 msgstr "��อมูล iCalendar"
 
-#: ../calendar/gui/itip-utils.c:978
-msgid "You must be an attendee of the event."
-msgstr "�ุ���อ������ู����าร�วม���ห�ุ�าร��"
-
-#: ../calendar/gui/memos-component.c:507
-msgid "_New Memo List"
-msgstr "ราย�าร�ั��ึ���วย�ำ�ห_ม�"
-
-#: ../calendar/gui/memos-component.c:590
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "�ั��ึ���วย�ำ %d ราย�าร"
-msgstr[1] "�ั��ึ���วย�ำ %d ราย�าร"
-
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] " �ลือ�อยู� %d ราย�าร"
-msgstr[1] " �ลือ�อยู� %d ราย�าร"
-
-#: ../calendar/gui/memos-component.c:639
-msgid "Failed upgrading memos."
-msgstr "�าร�รั��รุ�รุ���ั��ึ���วย�ำล�ม�หลว"
-
-#: ../calendar/gui/memos-component.c:769
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "�ม�สามาร���ิ�ราย�าร�ั��ึ���วย�ำ '%s' สำหรั��ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
-
-#: ../calendar/gui/memos-component.c:782
-msgid "There is no calendar available for creating memos"
-msgstr "�ม�มี��ิ�ิ��ี�������สำหรั��ารสร�า��ั��ึ���วย�ำ"
-
-#: ../calendar/gui/memos-component.c:892
-msgid "Memo Source Selector"
-msgstr "��รื�อ�มือ�ลือ��หล���ั��ึ���วย�ำ"
-
-#: ../calendar/gui/memos-component.c:1071
-msgid "New memo"
-msgstr "�ั��ึ���วย�ำ�หม�"
-
-#: ../calendar/gui/memos-component.c:1072
-msgctxt "New"
-msgid "Mem_o"
-msgstr "�ั��ึ�_��วย�ำ"
-
-#: ../calendar/gui/memos-component.c:1073
-msgid "Create a new memo"
-msgstr "สร�า��ั��ึ���วย�ำ�หม�"
-
-#: ../calendar/gui/memos-component.c:1079
-msgid "New shared memo"
-msgstr "�ั��ึ���วย�ำ���ร�วม�ิ���หม�"
-
-#: ../calendar/gui/memos-component.c:1080
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "�ั��ึ���วย�ำ���_ร�วม"
-
-#: ../calendar/gui/memos-component.c:1081
-msgid "Create a shared new memo"
-msgstr "สร�า��ั��ึ���วย�ำ���ร�วม�ิ���หม�"
-
-#: ../calendar/gui/memos-component.c:1087
-msgid "New memo list"
-msgstr "ราย�าร�ั��ึ���วย�ำ�หม�"
-
-#: ../calendar/gui/memos-component.c:1088
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "_ราย�าร�ั��ึ���วย�ำ"
-
-#: ../calendar/gui/memos-component.c:1089
-msgid "Create a new memo list"
-msgstr "สร�า�ราย�าร�ั��ึ���วย�ำ�หม�"
-
-#: ../calendar/gui/memos-control.c:389 ../calendar/gui/memos-control.c:405
-msgid "Print Memos"
-msgstr "�ิม���ั��ึ���วย�ำ"
-
-#: ../calendar/gui/migration.c:157
-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 ย�าย��อมูล��ล��อร��อ��ุ�..."
+#: ../calendar/gui/itip-utils.c:832
+msgid "Unable to book a resource, the new event collides with some other."
+msgstr "�ม�สามาร��อ��รั�ยา�ร��� ��ื�อ��า��ห�ุ�าร���หม����ั��ห�ุ�าร��อื��"
 
-#: ../calendar/gui/migration.c:161
-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
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "�ม�สามาร�ย�าย��อมูล�าร�ั����า���า�า� evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "�ม�สามาร�ย�าย��อมูล��ิ�ิ� `%s'"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "�ม�สามาร�ย�าย��อมูลภาร�ิ� `%s'"
+#: ../calendar/gui/itip-utils.c:834
+msgid "Unable to book a resource, error: "
+msgstr "�ม�สามาร��อ��รั�ยา�ร��� ��อ�ิ��ลา�: "
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "�ั��ึ���อ�วาม"
+#: ../calendar/gui/itip-utils.c:987
+msgid "You must be an attendee of the event."
+msgstr "�ุ���อ������ู����าร�วม���ห�ุ�าร��"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "วั��ี� 1"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "วั��ี� 2"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "วั��ี� 3"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "วั��ี� 4"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "วั��ี� 5"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "วั��ี� 6"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "วั��ี� 7"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "วั��ี� 8"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "วั��ี� 9"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "วั��ี� 10"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "วั��ี� 11"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "วั��ี� 12"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "วั��ี� 13"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "วั��ี� 14"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "วั��ี� 15"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "วั��ี� 16"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "วั��ี� 17"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "วั��ี� 18"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "วั��ี� 19"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "วั��ี� 20"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "วั��ี� 21"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "วั��ี� 22"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "วั��ี� 23"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "วั��ี� 24"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "วั��ี� 25"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "วั��ี� 26"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "วั��ี� 27"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "วั��ี� 28"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "วั��ี� 29"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "วั��ี� 30"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "วั��ี� 31"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "อา."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "�."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "อ."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "�."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "�ฤ."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "ศ."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "ส."
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "�ั�หมาย"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "ภาร�ิ�"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "สรุ�: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
 msgstr "�ู����า�ระ�ุม: "
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "ส�า�ะ: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "ระ�ั��วามสำ�ั�: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "��อร��������ี��สร��: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "หมว�: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
-msgstr "�ี�อยู��ิ���อ:"
-
-#: ../calendar/gui/tasks-component.c:499
-msgid "_New Task List"
-msgstr "ราย�ารภาร�ิ��_หม�"
-
-#: ../calendar/gui/tasks-component.c:582
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d ภาร�ิ�"
-msgstr[1] "%d ภาร�ิ�"
-
-#: ../calendar/gui/tasks-component.c:631
-msgid "Failed upgrading tasks."
-msgstr "�รั�รุ����อมูลภาร�ิ��ม�สำ�ร��"
-
-#: ../calendar/gui/tasks-component.c:764
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "�ม�สามาร���ิ�ราย�ารภาร�ิ� '%s' สำหรั��ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
-
-#: ../calendar/gui/tasks-component.c:777
-msgid "There is no calendar available for creating tasks"
-msgstr "�ม�มี��ิ�ิ��ี�������สำหรั��ารสร�า�ภาร�ิ�"
-
-#: ../calendar/gui/tasks-component.c:888
-msgid "Task Source Selector"
-msgstr "��รื�อ�มือ�ลือ��หล����อมูลภาร�ิ�"
-
-#: ../calendar/gui/tasks-component.c:1142
-msgid "New task"
-msgstr "ภาร�ิ��หม�"
-
-#: ../calendar/gui/tasks-component.c:1143
-msgctxt "New"
-msgid "_Task"
-msgstr "_ภาร�ิ�"
-
-#: ../calendar/gui/tasks-component.c:1144
-msgid "Create a new task"
-msgstr "สร�า�ภาร�ิ��หม�"
-
-#: ../calendar/gui/tasks-component.c:1150
-msgid "New assigned task"
-msgstr "ภาร�ิ��ี����รั�มอ�หมาย�หม�"
-
-#: ../calendar/gui/tasks-component.c:1151
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "ภาร�ิ��ี����รั�_มอ�หมาย"
-
-#: ../calendar/gui/tasks-component.c:1152
-msgid "Create a new assigned task"
-msgstr "สร�า�ภาร�ิ��ี����รั�มอ�หมาย�หม�"
-
-#: ../calendar/gui/tasks-component.c:1158
-msgid "New task list"
-msgstr "ราย�ารภาร�ิ��หม�"
-
-#: ../calendar/gui/tasks-component.c:1159
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "_ราย�ารภาร�ิ�"
-
-#: ../calendar/gui/tasks-component.c:1160
-msgid "Create a new task list"
-msgstr "สร�า�ราย�ารภาร�ิ��หม�"
-
-#: ../calendar/gui/tasks-control.c:488
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"��ิ�ั�ิ�าร�ี��ะล�ภาร�ิ��ั��หม��ี�มี�าร�ำ��รื�อ�หมาย�ว�ว�า�สร���ล�ว ��า�ุ��ำ��อ�� "
-"�ะ�ม�สามาร��รีย�ภาร�ิ��ั��หม��ั���ื�มา���อี�\n"
-"\n"
-"�ุ���อ��ารล�ภาร�ิ��ั��หม��ี��ริ�� หรือ�ม�?"
-
-#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1128
-msgid "Do not ask me again."
-msgstr "�ม���อ��ามอี��รั��"
-
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
-msgid "Print Tasks"
-msgstr "�ิม��ภาร�ิ�"
+msgstr "�ู��ิ���อ:"
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
@@ -9045,11 +6349,11 @@ msgstr "ย��ลิ�"
 msgid "In progress"
 msgstr "�ำลั��ำ��ิ��าร"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "มา��ว�า"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "��อย�ว�า"
 
@@ -9057,29 +6361,29 @@ msgstr "��อย�ว�า"
 msgid "Appointments and Meetings"
 msgstr "�ั�หมาย�ละ�าร�ระ�ุม"
 
-#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "�ำลั���ิ���ิ�ิ�"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "���ม iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "��รื�อ�มือ�ำ���า iCalendar �อ� Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "��ือ��วาม�ำ!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "���ม vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "��รื�อ�มือ�ำ���า vCalendar �อ� Evolution"
 
@@ -9640,7 +6944,7 @@ msgid "America/Nassau"
 msgstr "อ�มริ�า/��ส�อ"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "อ�มริ�า/�ิวยอร��"
 
@@ -10640,302 +7944,283 @@ msgstr "���ิ�ิ�/วาลลิส"
 msgid "Pacific/Yap"
 msgstr "���ิ�ิ�/Yap"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "�ม�สามาร���ิ����ม�ั��ึ�อั���มั�ิ"
-
-#: ../composer/e-composer-autosave.c:280
-msgid "Unable to retrieve message from editor"
-msgstr "�ม�สามาร��ึ���อ�วาม�า���รื�อ�มือ�����"
-
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "��ร����ม���"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "�_��"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "��หมาย�ม�มี�ื�อ�รื�อ�"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:202
+msgid "Save as..."
+msgstr "�ั��ึ�����..."
+
+#: ../composer/e-composer-actions.c:281
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "������ม"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "�ิ_�"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "�ิ����ม�ั��ุ�ั�"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "_�ิม��..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "�ัวอ_ย�า���อ��ิม��"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "�ั��ึ����ม�ั��ุ�ั�"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "�ั��ึ��_���..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "�ั��ึ����ม�ั��ุ�ั����ื�ออื��"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "�ั��ึ�������ั�_ร�า�"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "�ั��ึ�������ั�ร�า�"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "_ส��"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "ส����อ�วาม�ี�"
 
-#: ../composer/e-composer-actions.c:527
-msgid "Insert Send options"
-msgstr "��ร��ัว�ลือ��อ��ารส��"
-
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "_��อ�วาม�หม�"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "��ิ�ห��า��า���อ�วาม�หม�"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "รหัส_อั��ระ"
 
-#: ../composer/e-composer-actions.c:548
-msgid "_Security"
-msgstr "_ระ��รั�ษา�วาม�ลอ�ภัย"
-
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "�_��ารหัส PGP"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "���ารหัส��อ�วาม�ี���วย PGP"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "�_��� PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "�����ำ�ั���อ�วาม�ี���วย�ุ��� PGP �อ��ุ�"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "�ั�_ลำ�ั��วามสำ�ั��อ���อ�วาม"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "�ำห��ลำ�ั��วามสำ�ั��อ���อ�วาม����สำ�ั�สู�"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "ร�อ�_�อ�าร����รั���อ�วาม"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "รั��าร�����มื�อ��อ�วาม�อ��ุ��ู���ิ�อ�า�"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "���า_รหัส S/MIME"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "���ารหัส��อ�วาม�ี���วย�าร�รว�สอ��าร���ารหัส S/MIME �อ��ุ�"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "���_� S/MIME"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�����ำ�ั���อ�วาม�ี���วย��รั�รอ�ลาย���� S/MIME �อ��ุ�"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "��อ�สำ��า_ลั��ึ�"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "��อ�/�ส����อ� สำ��าลั��ึ� (BCC)"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "��อ�_สำ��า�ึ�"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "��อ�/�ส����อ� สำ��า�ึ� (CC)"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "��อ�_�า�"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "��อ�/�ส���ัว�ลือ��ู�ส��"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "��อ�_�ระ�าศ�ี�"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "��อ�/�ส����อ� �ระ�าศ�ี� (Post-To)"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "��อ�_�ี�อยู��อ��ลั�"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "��อ�/�ส����อ� �ี�อยู��อ��ลั� (Reply-To)"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "��อ��ื�อ�_รื�อ�"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "��อ�/�ส����อ���อมูล�ื�อ�รื�อ�"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "��อ�_�ึ�"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "��อ�/�ส����อ� �ึ� (To)"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "�ั��ึ���ั�ร�า�"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../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
 msgid "Enter the recipients of the message"
 msgstr "��อ��ื�อ�ู�รั���หมาย"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:44
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��อ��ี�อยู��ี��ะส��สำ��า��หมาย"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:47
 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:643
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "_�า�:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../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
 msgid "_Reply-To:"
 msgstr "_�ี�อยู��อ��ลั�:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "_�ึ�:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "_สำ��า�ึ�:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "สำ��า_ลั��ึ�:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "_�ระ�าศ�ี�:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "�_รื�อ�:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "ลาย���_�:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "�ลิ��ี��ี���า��อ��ารสมุ��ี�อยู�"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "�ี��ี��ะ��ะ�ระ�าศ"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "�ลือ���ล��อร��ี��ะ��ะ�ระ�าศ��อ�วาม"
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "�ลิ��ี��ี���ื�อ�ลือ���ล��อร��ี��ะ�ระ�าศ"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-msgid "Show _Attachment Bar"
-msgstr "�ส���_�����ม���"
+#: ../composer/e-composer-private.c:199
+msgid "Undo the last action"
+msgstr "�รีย��ื��าร�ระ�ำล�าสุ�"
+
+#: ../composer/e-composer-private.c:203
+msgid "Redo the last undone action"
+msgstr "�ำ��ำ�าร�ระ�ำ�ี��รีย��ื�ล�าสุ�"
+
+#: ../composer/e-composer-private.c:207
+msgid "Search for text"
+msgstr "���หา��อ�วาม"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-composer-private.c:211
+msgid "Search for and replace text"
+msgstr "���หา�ละ����ี���อ�วาม"
+
+#: ../composer/e-composer-private.c:301
+msgid "Save draft"
+msgstr "�ั��ึ���ั�ร�า�"
+
+#. Check buttons
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "�_ม���อ��ส����อ�วาม�ี�อี�"
+
+#: ../composer/e-msg-composer.c:983
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "�ม�สามาร������ำ�ั���อ�วาม�าออ�: �ม�����ำห����รั�รอ��าร�����ำ�ั�สำหรั��ั��ี�ี�"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:990
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "�ม�สามาร����ารหัสลั���อ�วาม�าออ�: �ม�����ำห����รั�รอ��าร���ารหัสลั�สำหรั��ั��ี�ี�"
 
-#: ../composer/e-msg-composer.c:1515 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "���ม���"
-msgstr[1] "���ม���"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "��อ��_�����ม���"
+#: ../composer/e-msg-composer.c:1381
+msgid "Unable to reconstruct message from autosave file"
+msgstr "�ม�สามาร�สร�า���อ�วาม�ลั��ื��า����ม�ั��ึ�อั���มั�ิ���"
 
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
 msgid "Compose Message"
 msgstr "��ีย���หมาย"
 
-#: ../composer/e-msg-composer.c:4095
+#: ../composer/e-msg-composer.c:3312
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10998,22 +8283,18 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "�ม�สามาร��ั��ึ�ล����ม�ั��ึ�อั���มั�ิ &quot;{0}&quot;"
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "�ม�สามาร�������ร��อรี���ั���หมาย"
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "�ุ���อ��าร�รีย��ื���อ�วาม�ี���ีย���า��ว�หรือ�ม�?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "�ำลั��าว���หล� �ุ���อ��าร�ะส���มลหรือ�ม�?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "��ิ���อ�ิ��ลา���ะ�ั��ึ������ั��ึ�อั���มั�ิ ��ราะว�า &quot;{1}&quot;"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11021,30 +8302,11 @@ msgstr ""
 "Evolution ���าร�ำ�า��ระ�ั�หั���ะ�ี��ุ��ำลั���ีย���หมาย "
 "�าร�รีย��ื��ะ��วย�ห��ุ���ีย���อ�า��รั���ี��ล�ว���"
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"มี�ัว�ลือ��อ��ารส�����าะสำหรั��ั��ี Novell GroupWise �ละ Microsoft Exchange ���า�ั��"
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "�ม�มี�ัว�ลือ��อ��ารส��"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "���ม '{0}' �ม�������ม���ิ �ละ�ม�สามาร�ส��������หมาย"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"หา���อ��าร�����ื�อหา�อ����ร��อรี�ี� �ุ�อา�������ม��า�� �����ร��อรี�ี��ีละ���ม "
-"หรือ�ม���สร�า����ม�ั������อ����ร��อรี�ล�ว������ม�ั������ั��ล�าว��"
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -11055,53 +8317,309 @@ msgstr ""
 "\n"
 "�รุ�า�รว�สอ��ห������ ว�า�ุ�����ิ��ั�� gtkhtml �ละ libgtkhtml รุ���ี��ู���อ�"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "�ม�สามาร��รีย����วิ������ลือ��ี�อยู����"
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "�รว�����อ�วาม�ี���ีย���า��ว�"
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "�ำ��ือ�: ��อ�วามมี�าร��ลี�ย���ล�"
-
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "�ุ��ม�สามาร�������ม `{0}' ���ั���หมาย�ี�"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "�ุ��ะ��อ��ำห����า�ั��ี�ู������อ��ี��ุ��ะสามาร���ีย��มล���"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "�����_��อ��"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "�_ม��รีย��ื�"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "�_รีย��ื�"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "_�ั��ึ���ั�ร�า�"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr "�รีย��ำ�า� Anjal ��ห��า��า�"
+
+#: ../capplet/anjal-settings-main.c:200
+msgid "Make Anjal the default email client"
+msgstr "�ำห���ห� Anjal ������ร��รมอ�า�-��ีย��มล�ริยาย"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr "ID �อ���อ������ี��ะ�ั��ัว���า��"
+
+#: ../capplet/anjal-settings-main.c:208
+msgid "socket"
+msgstr "��อ�����"
+
+#: ../capplet/anjal-settings-main.c:221
+msgid "Anjal email client"
+msgstr "��ร��รมอ�า�-��ีย��มล Anjal"
+
+#: ../capplet/settings/mail-account-view.c:56
+msgid "Please enter your full name."
+msgstr "�รุ�า��อ��ื�อ���ม�อ��ุ�"
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr "�รุ�า��อ��ี�อยู�อี�มล�อ��ุ�"
+
+#: ../capplet/settings/mail-account-view.c:58
+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:186
+msgid "Name:"
+msgstr "�ื�อ:"
+
+#: ../capplet/settings/mail-account-view.c:195
+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:210
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Server type:"
+msgstr "��ิ���ิร���วอร�:"
+
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
+msgid "Server address:"
+msgstr "�ี�อยู���ิร���วอร�:"
+
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
+msgid "Username:"
+msgstr "�ื�อ�ู����:"
+
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
+msgid "Use encryption:"
+msgstr "����าร���ารหัสลั�:"
+
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
+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:309
+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. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"���าร�����ร��รมอี�มล�ี� �ุ���อ��ั����า�ั��ี�สีย��อ� �รุ�า��อ��ี�อยู�อี�มล�ละรหัส��า��อ��ุ��ี���า�ล�า��ี� "
+"�ล�ว�รา�ะ�ยายาม�ั����า��า�� �ห� ��า�รา�ม�สามาร��ั����า���อั���มั�ิ��� "
+"�ุ����ะ��อ���อ�รายละ�อีย��อ���ิร���วอร��อ��ุ���วย"
+
+#: ../capplet/settings/mail-account-view.c:311
+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 "
+"entered but you may need to change them."
+msgstr ""
+"�ออภัย �รา�ม�สามาร��ั����า�ห��ั��มล�อ��ุ���ยอั���มั�ิ��� �รุ�า��อ���า��า�� �ี���า�ล�า��ี� "
+"�รา�����ิม��า�ั������า�รายละ�อีย��ี��ุ���อ��ว��ล�ว ����ุ�อา���อ���ลี�ย���า��า�� อี��ี"
+
+#: ../capplet/settings/mail-account-view.c:313
+msgid "You can specify more options to configure the account."
+msgstr "�ุ�สามาร�ระ�ุ�ัว�ลือ���ิ�ม��ิม��ื�อ�ั����า�ั��ี���"
+
+#: ../capplet/settings/mail-account-view.c:315
+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."
+msgstr ""
+"�ี�ี� �รา��อ��าร��า��า�� �อ��ุ���ื�อ���ส���มล �รา����ยายาม��า��า�า�อย�า��ว��ล�ว "
+"����ุ��วร�รว�สอ���า�หล�า�ั����ื�อ�วาม�����"
+
+#: ../capplet/settings/mail-account-view.c:316
+msgid "You can specify your default settings for your account."
+msgstr "�ุ�สามาร�ระ�ุ��า�ริยาย��า�� สำหรั��ั��ี�อ��ุ����"
+
+#: ../capplet/settings/mail-account-view.c:317
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+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
+msgid "Identity"
+msgstr "��อมูล�ุ��ล"
+
+#: ../capplet/settings/mail-account-view.c:332
+msgid "Next - Receiving mail"
+msgstr "�ั����อ�� - �ารรั��มล"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Receiving mail"
+msgstr "�ารรั��มล"
+
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
+msgid "Next - Sending mail"
+msgstr "�ั����อ�� - �ารส���มล"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Back - Identity"
+msgstr "ย�อ��ื� - ��อมูล�ุ��ล"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Next - Receiving options"
+msgstr "�ั����อ�� - �ัว�ลือ��ารรั��มล"
+
+#: ../capplet/settings/mail-account-view.c:334
+msgid "Receiving options"
+msgstr "�ัว�ลือ��ารรั��มล"
+
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Back - Receiving mail"
+msgstr "ย�อ��ื� - �ารรั��มล"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Sending mail"
+msgstr "�ารส���มล"
+
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
+msgid "Next - Review account"
+msgstr "�ั����อ�� - �รว��า��ั��ี"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Next - Defaults"
+msgstr "�ั����อ�� - ��า�ริยาย"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Back - Receiving options"
+msgstr "ย�อ��ื� - �ัว�ลือ��ารรั��มล"
+
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+msgid "Defaults"
+msgstr "��า�ริยาย"
+
+#: ../capplet/settings/mail-account-view.c:337
+msgid "Back - Sending mail"
+msgstr "ย�อ��ื� - �ารส���มล"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Review account"
+msgstr "�รว��า��ั��ี"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Finish"
+msgstr "�สร��สิ��"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Back - Sending"
+msgstr "ย�อ��ื� - �ารส���มล"
+
+#: ../capplet/settings/mail-account-view.c:671
+#: ../capplet/settings/mail-settings-view.c:262
+msgid "Close Tab"
+msgstr "�ิ�����"
+
+#: ../capplet/settings/mail-account-view.c:681
+msgid "Account Wizard"
+msgstr "��รื�อ�มือ��วยสร�า��ั��ี"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
+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
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../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
+msgid "On This Computer"
+msgstr "���อม�ิว��อร��ี�"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "��ลี�ย���ล�"
+
+#: ../capplet/settings/mail-settings-view.c:148
+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:272
+msgid "Settings"
+msgstr "��า�ั��"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "�าร�����ห�ุ�าร����ิ�ิ�"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "��รื�อ�มือ������ือ� �อ� Evolution"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:825
+#: ../shell/e-shell-window-private.c:251
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "�มล�ละ��ิ�ิ��อ� Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "�ุ��รุ���วร�"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
-msgstr "�ั��ารอี�มล �ี�อยู��ิ���อ �ละ�ั�หมาย�อ��ุ�"
+msgstr "�ั��ารอี�มล �ู��ิ���อ �ละ�ั�หมาย�อ��ุ�"
+
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "�ั����า�ั��ีอี�มล"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "�ั����าอี�มล"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -11111,104 +8629,250 @@ msgstr "�าม�ั�ร�ี�อยู�"
 msgid "calendar information"
 msgstr "��อมูล��ิ�ิ�"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (ย��ลิ��ล�ว)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (�สร���ล�ว)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%s..."
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (�สร���ล�ว %d%%)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
 msgid "Evolution Error"
 msgstr "��อ�ิ��ลา��� Evolution"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
 msgid "Evolution Warning"
 msgstr "�ำ��ือ��อ� Evolution"
 
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "��อมูล Evolution"
-
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "�ำ�าม�า� Evolution"
-
-#. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-alert.c:634
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "��อ�ิ��ลา�ภาย���ม��รา�สา�ห�ุ ��ะมี�ารร�อ��อ '%s'"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "อ����ระ�อ�"
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "อาร�ิ�"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "�อล�ิ�"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "ยุ�ร��อ��ลา�"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "�ี�"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "�ีริลลิ�"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "�รี�"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "ฮี�รู"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "�ี��ุ��"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "��าหลี"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "��ย"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "�ุร�ี"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "ยู�ิ����"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "ยุ�ร��ะวั���"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "ยุ�ร��ะวั���, �หม�"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+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
+msgid "Simplified"
+msgstr "�ัวย�อ"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "ยู��ร�"
+
+#: ../e-util/e-charset.c:97
+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
+#: ../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
+msgid "Tomorrow"
+msgstr "�รุ���ี�"
+
+#: ../e-util/e-datetime-format.c:207
+msgid "Yesterday"
+msgstr "�มื�อวา�"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
-msgstr "�ื�อ�อ�อ����ระ�อ��ี��ำลั��ั��ึ��ูม"
+#: ../e-util/e-datetime-format.c:210
+#, c-format
+msgid "%d days from now"
+msgstr "อี� %d วั�"
+
+#: ../e-util/e-datetime-format.c:212
+#, c-format
+msgid "%d days ago"
+msgstr "%d วั���อ�"
+
+#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
+msgid "Use locale default"
+msgstr "�����า�ริยาย�อ��ล��ล"
+
+#: ../e-util/e-datetime-format.c:499
+msgid "Format:"
+msgstr "รู����:"
+
+#: ../e-util/e-file-utils.c:136
+msgid "(Unknown Filename)"
+msgstr "(�ม��รา��ื�อ���ม)"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, c-format
+msgid "Writing \"%s\""
+msgstr "�ำลั���ีย� \"%s\""
+
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
+#, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "�ำลั���ีย� \"%s\" ��ยั� %s"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../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 "�ั��ึ�สำหรั��าร�ี�ั��"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "�ส��_��อ�ิ��ลา������ส�า�ะ�����วลา"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "วิ�า�ี"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "��อ�วาม�ั��ึ�:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "ระ�ั��าร�ั��ึ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
-msgid "Time"
-msgstr "�วลา"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "��อ�วาม"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "�ิ�ห��า��า��ี�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "��อ�ิ��ลา�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "��อ�ิ��ลา�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "�ำ��ือ��ละ��อ�ิ��ลา�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "��อ�วาม�ี�ั��"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "��อ�ิ��ลา� �ำ��ือ� �ละ��อ�วาม�ี�ั��"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../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:309
+#: ../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
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "สั��าห�"
+
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "��ิ���อ�ิ��ลา���ะสั���ิม��"
@@ -11222,7 +8886,11 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "ระ���าร�ิม���ม����ราย�า�รายละ�อีย���ิ�ม��ิม��ี�ยว�ั���อ�ิ��ลา�"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-signature.c:701
+msgid "Autogenerated"
+msgstr "สร�า���ยอั���มั�ิ"
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "��ื�อ��า� \"{1}\""
 
@@ -11242,255 +8910,303 @@ msgstr "�ุ���อ��าร��ีย��ั����หรื
 msgid "File exists \"{0}\"."
 msgstr "มี���ม \"{0}\" อยู���อ��ล�ว"
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "��ีย��ั����มหรือ�ม�?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
 msgid "_Overwrite"
 msgstr "�_�ีย��ั�"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "�ม�สามาร���ิ�ลิ���"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "�ม�สามาร��ส��วิ�ี���สำหรั� Evolution"
 
-#: ../e-util/e-util-labels.c:39
-msgid "I_mportant"
-msgstr "_สำ�ั�"
+#: ../e-util/gconf-bridge.c:1307
+#, c-format
+msgid "GConf error: %s"
+msgstr "��อ�ิ��ลา��� GConf: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:40
-msgid "_Work"
-msgstr "_�า�"
+#: ../e-util/gconf-bridge.c:1318
+msgid "All further errors shown only on terminal."
+msgstr "รายละ�อีย���อ�ิ��ลา�อื��� อยู�����อร�มิ�ัล���า�ั��"
 
-#. orange
-#: ../e-util/e-util-labels.c:41
-msgid "_Personal"
-msgstr "ส�ว�_�ุ��ล"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "�ี�อยู��อ��ลั�"
 
-#. green
-#: ../e-util/e-util-labels.c:42
-msgid "_To Do"
-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
+msgid "Cc"
+msgstr "สำ��า�ึ�"
 
-#. blue
-#: ../e-util/e-util-labels.c:43
-msgid "_Later"
-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
+msgid "Bcc"
+msgstr "สำ��าลั��ึ�"
 
-#: ../e-util/e-util-labels.c:315
-msgid "Label _Name:"
-msgstr "��าย_�ื�อ:"
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../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
+msgid "Subject"
+msgstr "�รื�อ�"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Edit Label"
-msgstr "�������าย�ื�อ"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
+#: ../modules/mail/em-mailer-prefs.c:1130
+msgid "Mailer"
+msgstr "��ร��รมส���มล"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Add Label"
-msgstr "��ิ�ม��าย�ื�อ"
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+msgid "-------- Forwarded Message --------"
+msgstr "-------- ��อ�วามส����อ --------"
 
-#: ../e-util/e-util-labels.c:357
-msgid "Label name cannot be empty."
-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
+msgid "Date"
+msgstr "วั��ี�"
 
-#: ../e-util/e-util-labels.c:362
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr "มี��าย�ื�อ�ี�����ื�อ��ียว�ั�อยู���อ��ล�ว����ิร���วอร� �รุ�า�ั���ื�อ�หม�"
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "�ลุ�ม��าว"
+
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "รู���าย"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../em-format/em-format.c:1319
 #, c-format
-msgid "GConf error: %s"
-msgstr "��อ�ิ��ลา��� GConf: %s"
+msgid "%s attachment"
+msgstr "���ม��� %s"
 
-#: ../e-util/gconf-bridge.c:1232
-msgid "All further errors shown only on terminal."
-msgstr "รายละ�อีย���อ�ิ��ลา�อื��� อยู�����อร�มิ�ัล���า�ั��"
+#: ../em-format/em-format.c:1374
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "�ม�สามาร������อ�วาม S/MIME: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../filter/filter-datespec.c:81
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "�ม�สามาร������อ�วาม MIME �ะ�ส����อ�วาม�����ั�"
+
+#: ../em-format/em-format.c:1520
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "��ิ��าร���ารหัสลั��ี��ม�รอ�รั�สำหรั� multipart/encrypted"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message"
+msgstr "�ม�สามาร������อ�วาม PGP/MIME"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "�ม�สามาร������อ�วาม PGP/MIME: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
+
+#: ../em-format/em-format.c:1698
+msgid "Unsupported signature format"
+msgstr "รู����ลาย�����ี��ม�รอ�รั�"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+msgid "Error verifying signature"
+msgstr "��ิ���อ�ิ��ลา���ะ�รว�สอ�ลาย����"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
+msgid "Unknown error verifying signature"
+msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ��ะ�รว�สอ�ลาย����"
+
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message"
+msgstr "�ม�สามาร������อ�วาม PGP"
+
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message: Unknown error"
+msgstr "�ม�สามาร������อ�วาม PGP: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
+
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 วิ�า�ี��อ�"
 msgstr[1] "%d วิ�า�ี��อ�"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 วิ�า�ี��า�ห��า"
 msgstr[1] "%d วิ�า�ี��า�ห��า"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 �า�ี��อ�"
 msgstr[1] "%d �า�ี��อ�"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 �า�ี��า�ห��า"
 msgstr[1] "%d �า�ี��า�ห��า"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 �ั�ว�ม���อ�"
 msgstr[1] "%d �ั�ว�ม���อ�"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 �ั�ว�ม���า�ห��า"
 msgstr[1] "%d �ั�ว�ม���า�ห��า"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 วั���อ�"
 msgstr[1] "%d วั���อ�"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 วั���า�ห��า"
 msgstr[1] "%d วั���า�ห��า"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 สั��าห���อ�"
 msgstr[1] "%d สั��าห���อ�"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 สั��าห���า�ห��า"
 msgstr[1] "%d สั��าห���า�ห��า"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 ��ือ���อ�"
 msgstr[1] "%d ��ือ���อ�"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 ��ือ���า�ห��า"
 msgstr[1] "%d ��ือ���า�ห��า"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 �ี��อ�"
 msgstr[1] "%d �ี��อ�"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 �ี��า�ห��า"
 msgstr[1] "%d �ี��า�ห��า"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<�ลิ��ี��ี���ื�อ�ลือ�วั��ี�>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "��ะ�ี�"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Ey"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "�ลือ��วลา�ี��ะ���������า��รีย���ีย�"
 
-#: ../filter/filter-file.c:284
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+msgid "Choose a File"
 msgstr "�ลือ����ม"
 
-#: ../filter/filter-part.c:532
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "��สอ�"
-
-#: ../filter/filter-rule.c:853
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "�ื�อ_��:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "หาราย�าร�ี�สอ��ล�อ��ั���ื�อ�����อ���ี�"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "��ิ�ม�_�ื�อ���"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "��า�ร��ุ���ื�อ���"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "��า�ร���ื�อ�������ื�อ���ห�ึ��"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "_หาราย�าร:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "�ั��หม��ี���ี�ยว��อ�"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "�อ�"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "�อ��ละ����รื�อ�"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "�ม�มี��อ�วาม�อ�หรือ����รื�อ�"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "_รวม�ระ�ู���วย"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "���า"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "ออ�"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "��ิ�ม��"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "�������"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "�ิ�����ร��ิวลาร� &quot;{0}&quot; �ิ�"
@@ -11511,7 +9227,7 @@ msgstr "�ม�มีวั��ี�"
 msgid "Missing file name."
 msgstr "�ม�มี�ื�อ���ม"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
 msgid "Missing name."
 msgstr "�ม�มี�ื�อ"
 
@@ -11535,19 +9251,15 @@ msgstr "�ุ���อ��ั���ื�อ�ัว�รอ��ี
 msgid "You must specify a file name."
 msgstr "�ุ���อ�ระ�ุ�ื�อ���ม"
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_���าร�รอ�</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "��รีย���ีย��ั�"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "�ส���ัว�รอ�สำหรั��มล:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -11555,7 +9267,7 @@ msgstr ""
 "�วลา�อ���อ�วาม�ะ�ู���รีย���ีย��ั��วลา\n"
 "0.00 �. �อ�วั��ี�ระ�ุ"
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -11563,7 +9275,7 @@ msgstr ""
 "�วลา�อ���อ�วาม�ะ�ู���รีย���ีย��ั��วลา\n"
 "�ี��ั���ีย��ั��วลา�ี��าร�รอ���ิ��ึ��"
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -11571,140 +9283,885 @@ msgstr ""
 "�วลา�อ���อ�วาม�ะ�ู���รีย���ีย��ั��วลา\n"
 "�ั��ุ�ั���ะ�ี��าร�รอ���ิ��ึ��"
 
-#: ../filter/filter.glade.h:12
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "_���าร�รอ�"
+
+#: ../filter/filter.ui.h:12
 msgid "a time relative to the current time"
 msgstr "�วลา�ั���ีย��ั��วลา�ั��ุ�ั�"
 
-#: ../filter/filter.glade.h:13
+#: ../filter/filter.ui.h:13
 msgid "ago"
 msgstr "��อ�"
 
-#: ../filter/filter.glade.h:16
+#: ../filter/filter.ui.h:16
 msgid "in the future"
 msgstr "��า�ห��า"
 
-#: ../filter/filter.glade.h:18
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "months"
 msgstr "��ือ�"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
 msgid "seconds"
 msgstr "วิ�า�ี"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.ui.h:20
 msgid "the current time"
 msgstr "�วลา�ั��ุ�ั�"
 
-#: ../filter/filter.glade.h:21
+#: ../filter/filter.ui.h:21
 msgid "the time you specify"
 msgstr "�วลา�ี��ุ�ระ�ุ"
 
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "weeks"
-msgstr "สั��าห�"
-
-#: ../filter/filter.glade.h:23
+#: ../filter/filter.ui.h:23
 msgid "years"
 msgstr "�ี"
 
-#: ../filter/rule-editor.c:382
-msgid "Add Rule"
-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
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "���ม���"
+msgstr[1] "���ม���"
 
-#: ../filter/rule-editor.c:463
-msgid "Edit Rule"
-msgstr "�������"
+#: ../mail/e-mail-attachment-bar.c:621
+#: ../widgets/misc/e-attachment-paned.c:612
+msgid "Icon View"
+msgstr "มุมมอ��อ�อ�"
 
-#: ../filter/rule-editor.c:809
-msgid "Rule name"
-msgstr "�ื�อ��"
+#: ../mail/e-mail-attachment-bar.c:622
+#: ../widgets/misc/e-attachment-paned.c:613
+msgid "List View"
+msgstr "มุมมอ�ราย�ื�อ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-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-display.c:66
+msgid "_Add to Address Book..."
+msgstr "�_�ิ�ม��สมุ��ี�อยู�..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "�_��ี�อยู��ี�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "_�า��ี�อยู��ี�"
+
+#: ../mail/e-mail-display.c:89
+msgid "Create Search _Folder"
+msgstr "สร�า��_�ล��อร����หา"
+
+#: ../mail/e-mail-label-dialog.c:220
+msgid "_Label name:"
+msgstr "��าย_�ื�อ:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "_สำ�ั�"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_�า�"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "ส�ว��ุ_��ล"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "�ะ_�ำ"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "�ว��ีห_ลั�"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:519
+msgid "Add Label"
+msgstr "��ิ�ม��าย"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "�������าย"
+
+#: ../mail/e-mail-label-manager.c:349
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "�ั����า�มล รวม�ึ�ระ��รั�ษา�วาม�ลอ�ภัย�ละ�าร�ส���ล �ี��ี�"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"หมาย�ห�ุ: ��รื�อ�หมาย�ี�ล�า����ื�อ��าย�ะ�ู����\n"
+"�����ีย���ว����ม�ู"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "�ั����า�าร�รว��ัวสะ�� ลาย���� �ละ��รื�อ�มือ��ีย���อ�วาม �ี��ี�"
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "สี"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-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:2582
+#: ../modules/mail/e-mail-shell-view-private.c:963
+msgid "Inbox"
+msgstr "��หมาย���า"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "�ั����า�าร��ื�อม��อ��รือ��าย�อ��ุ��ี��ี�"
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+msgid "Drafts"
+msgstr "��หมายร�า�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "�มล Evolution"
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+msgid "Outbox"
+msgstr "��หมายออ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "��รื�อ�มือ�ว��ุม�าร�ั����า�ั��ี�มล�อ� Evolution"
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+msgid "Sent"
+msgstr "ส���ล�ว"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "อ����ระ�อ��มล�อ� Evolution"
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "�ม����"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "��รื�อ�มือ��ีย��มล�อ� Evolution"
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "สำ�ั�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "��รื�อ�มือ�ว��ุม��า�ั����รื�อ�มือ��ีย��มล�อ� Evolution"
+#. green
+#: ../mail/e-mail-migrate.c:963
+msgid "To Do"
+msgstr "�ะ�ำ"
+
+#. blue
+#: ../mail/e-mail-migrate.c:964
+msgid "Later"
+msgstr "�ว��ีหลั�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "��รื�อ�มือ�ว��ุม�าร�รั������มล�อ� Evolution"
+#: ../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
+msgid "Migrating..."
+msgstr "�ำลั�ย�าย��อมูล..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "��รื�อ�มือ�ว��ุม��า�ั���าร��ื�อม��อ��รือ��าย Evolution"
+#: ../mail/e-mail-migrate.c:1143
+msgid "Migration"
+msgstr "�ารย�าย��อมูล"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-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
+#, c-format
+msgid "Migrating '%s':"
+msgstr "�ำลั�ย�าย��อมูล '%s':"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
-msgid "Mail Accounts"
-msgstr "�ั��ี�มล"
+#: ../mail/e-mail-migrate.c:1594
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "�ม�สามาร�สร�า���ล��อร��หม� `%s': %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
-msgid "Mail Preferences"
-msgstr "�รั�����ระ���มล"
+#: ../mail/e-mail-migrate.c:1622
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "�ม�สามาร��ั�ลอ���ล��อร� `%s' ��ยั� `%s': %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "�รั�������รือ��าย"
+#: ../mail/e-mail-migrate.c:1817
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "�ม�สามาร��รว�หา�ล�อ��มล�ี�มีอยู��ี� `%s': %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
-msgid "_Mail"
-msgstr "�_มล"
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+msgid "Migrating Folders"
+msgstr "�ำลั�ย�าย��อมูล��ล��อร���า��"
 
-#: ../mail/em-account-editor.c:386
+#: ../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
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"��ร�สร�า�สรุ��อ���ล��อร��ล�อ��มล�อ� Evolution ��ลี�ย������ SQLite �ั����� Evolution "
+"2.24\n"
+"\n"
+"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
+
+#: ../mail/e-mail-migrate.c:3030
+#, 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' "
+"หรือ���ม�สียหาย"
+
+#. 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
+msgid "Do not ask me again"
+msgstr "�ม���อ��ามอี�"
+
+#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "�ั�ลอ���ยั���ล��อร�"
+
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+msgid "C_opy"
+msgstr "_�ั�ลอ�"
+
+#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "ย�าย��ยั���ล��อร�"
+
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+msgid "_Move"
+msgstr "_ย�าย"
+
+#: ../mail/e-mail-reader.c:864
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "�ั��ึ���อ�วาม"
+msgstr[1] "�ั��ึ���อ�วาม"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * 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
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "��อ�วาม"
+msgstr[1] "��อ�วาม"
+
+#: ../mail/e-mail-reader.c:1143
+msgid "A_dd Sender to Address Book"
+msgstr "�_�ิ�ม�ู�ส����สมุ��ี�อยู�"
+
+#: ../mail/e-mail-reader.c:1145
+msgid "Add sender to address book"
+msgstr "��ิ�ม�ู�ส����สมุ��ี�อยู�"
+
+#: ../mail/e-mail-reader.c:1150
+msgid "Check for _Junk"
+msgstr "�รว��มล_�ยะ"
+
+#: ../mail/e-mail-reader.c:1152
+msgid "Filter the selected messages for junk status"
+msgstr "�รอ���อ�วาม�ี��ลือ�สำหรั�ส�า�ะ�มล�ยะ"
+
+#: ../mail/e-mail-reader.c:1157
+msgid "_Copy to Folder..."
+msgstr "_�ั�ลอ���ยั���ล��อร�..."
+
+#: ../mail/e-mail-reader.c:1159
+msgid "Copy selected messages to another folder"
+msgstr "�ั�ลอ���อ�วาม�ี��ลือ���ยั���ล��อร�อื��"
+
+#: ../mail/e-mail-reader.c:1164
+msgid "_Delete Message"
+msgstr "_ล���อ�วาม"
+
+#: ../mail/e-mail-reader.c:1166
+msgid "Mark the selected messages for deletion"
+msgstr "�ำ��รื�อ�หมาย��ื�อล���อ�วาม�ี��ลือ�"
+
+#: ../mail/e-mail-reader.c:1171
+msgid "Filter on Mailing _List..."
+msgstr "�รอ��ี��_มลลิ�ลิส��..."
+
+#: ../mail/e-mail-reader.c:1173
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "สร�า�����ื�อ�รอ���อ�วาม��ยั��มลลิ�ลิส���ี�"
+
+#: ../mail/e-mail-reader.c:1178
+msgid "Filter on _Recipients..."
+msgstr "�รอ��ี��ื�อ�ู�_รั�..."
+
+#: ../mail/e-mail-reader.c:1180
+msgid "Create a rule to filter messages to these recipients"
+msgstr "สร�า�����ื�อ�รอ���อ�วาม��ยั��ู�รั��หล�า�ี�"
+
+#: ../mail/e-mail-reader.c:1185
+msgid "Filter on Se_nder..."
+msgstr "�รอ��ี��ู�_ส��..."
+
+#: ../mail/e-mail-reader.c:1187
+msgid "Create a rule to filter messages from this sender"
+msgstr "สร�า�����ื�อ�รอ���อ�วาม�า��ู�ส���ี�"
+
+#: ../mail/e-mail-reader.c:1192
+msgid "Filter on _Subject..."
+msgstr "�รอ��ี��ื�อ�_รื�อ�..."
+
+#: ../mail/e-mail-reader.c:1194
+msgid "Create a rule to filter messages with this subject"
+msgstr "สร�า�����ื�อ�รอ���อ�วาม��วย�ื�อ�รื�อ��ี�"
+
+#: ../mail/e-mail-reader.c:1199
+msgid "A_pply Filters"
+msgstr "_��อ����า�ัว�รอ�"
+
+#: ../mail/e-mail-reader.c:1201
+msgid "Apply filter rules to the selected messages"
+msgstr "������าร�รอ��รอ���อ�วาม�ี��ลือ�"
+
+#: ../mail/e-mail-reader.c:1206
+msgid "_Find in Message..."
+msgstr "_หา����อ�วาม..."
+
+#: ../mail/e-mail-reader.c:1208
+msgid "Search for text in the body of the displayed message"
+msgstr "���หา��อ�วาม���ัว��อ�วาม�ี��ส��อยู�"
+
+#: ../mail/e-mail-reader.c:1213
+msgid "_Clear Flag"
+msgstr "_ล�า���"
+
+#: ../mail/e-mail-reader.c:1215
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "�อา���าม�ระ�ู�ออ��า���อ�วาม�ี��ลือ�"
+
+#: ../mail/e-mail-reader.c:1220
+msgid "_Flag Completed"
+msgstr "_�ั���ว�า�สร���ล�ว"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "�ั����าม�ระ�ู�����อ�วาม�ี��ลือ�ว�า�สร���ล�ว"
+
+#: ../mail/e-mail-reader.c:1227
+msgid "Follow _Up..."
+msgstr "�ิ�_�าม�ระ�ู�..."
+
+#: ../mail/e-mail-reader.c:1229
+msgid "Flag the selected messages for follow-up"
+msgstr "�ั����ี���อ�วาม�ี��ลือ���ื�อ�าม�ระ�ู�"
+
+#: ../mail/e-mail-reader.c:1234
+msgid "_Attached"
+msgstr "�_��"
+
+#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+msgid "Forward the selected message to someone as an attachment"
+msgstr "ส����อ��อ�วาม�ี��ลือ���ยั��ู�อื���������ม���"
+
+#: ../mail/e-mail-reader.c:1241
+msgid "Forward As _Attached"
+msgstr "ส����อ�������ม�_��"
+
+#: ../mail/e-mail-reader.c:1248
+msgid "_Inline"
+msgstr "�_���อ�วาม"
+
+#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+msgid "Forward the selected message in the body of a new message"
+msgstr "ส����อ��อ�วาม�ี��ลือ���ย������ื�อหา����อ�วาม�ี�ส��"
+
+#: ../mail/e-mail-reader.c:1255
+msgid "Forward As _Inline"
+msgstr "ส����อ����_��อ�วาม"
+
+#: ../mail/e-mail-reader.c:1262
+msgid "_Quoted"
+msgstr "อ�า�_�ำ�ู�"
+
+#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+msgid "Forward the selected message quoted like a reply"
+msgstr "ส����อ��อ�วาม�ี��ลือ���ยอ�า��ำ�ู��หมือ��าร�อ�"
+
+#: ../mail/e-mail-reader.c:1269
+msgid "Forward As _Quoted"
+msgstr "ส����อ�����าร_อ�า��ำ�ู�"
+
+#: ../mail/e-mail-reader.c:1276
+msgid "_Load Images"
+msgstr "�_หล�ภา�"
+
+#: ../mail/e-mail-reader.c:1278
+msgid "Force images in HTML mail to be loaded"
+msgstr "�ั��ั��ห��หล�รู�ภา����มล HTML �ั��หม�"
+
+#: ../mail/e-mail-reader.c:1283
+msgid "_Important"
+msgstr "_สำ�ั�"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "Mark the selected messages as important"
+msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า������อ�วามสำ�ั�"
+
+#: ../mail/e-mail-reader.c:1290
+msgid "_Junk"
+msgstr "�มล_�ยะ"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Mark the selected messages as junk"
+msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า�����มล�ยะ"
+
+#: ../mail/e-mail-reader.c:1297
+msgid "_Not Junk"
+msgstr "�ม�����มล_�ยะ"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Mark the selected messages as not being junk"
+msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า�ม�����มล�ยะ"
+
+#: ../mail/e-mail-reader.c:1304
+msgid "_Read"
+msgstr "_อ�า��ล�ว"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Mark the selected messages as having been read"
+msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ���ื�อ�ส��ว�า���อ�า��ล�ว"
+
+#: ../mail/e-mail-reader.c:1311
+msgid "Uni_mportant"
+msgstr "�_ม�สำ�ั�"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Mark the selected messages as unimportant"
+msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า������อ�วาม�ม�สำ�ั�"
+
+#: ../mail/e-mail-reader.c:1318
+msgid "_Unread"
+msgstr "_ยั��ม����อ�า�"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Mark the selected messages as not having been read"
+msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�ายั��ม����อ�า�"
+
+#: ../mail/e-mail-reader.c:1325
+msgid "_Edit as New Message..."
+msgstr "�_����������อ�วาม�หม�..."
+
+#: ../mail/e-mail-reader.c:1327
+msgid "Open the selected messages in the composer for editing"
+msgstr "��ิ���อ�วาม�ี��ลือ���ห��า��า���ีย���หมาย��ื�อ�����"
+
+#: ../mail/e-mail-reader.c:1332
+msgid "Compose _New Message"
+msgstr "��ีย�_��อ�วาม�หม�"
+
+#: ../mail/e-mail-reader.c:1334
+msgid "Open a window for composing a mail message"
+msgstr "��ิ�ห��า��า�สำหรั��าร��ีย���อ�วาม�มล"
+
+#: ../mail/e-mail-reader.c:1339
+msgid "_Open in New Window"
+msgstr "��ิ���_ห��า��า��หม�"
+
+#: ../mail/e-mail-reader.c:1341
+msgid "Open the selected messages in a new window"
+msgstr "��ิ���อ�วาม�ี��ลือ���ห��า��า��หม�"
+
+#: ../mail/e-mail-reader.c:1346
+msgid "_Move to Folder..."
+msgstr "_ย�าย��ยั���ล��อร�..."
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Move selected messages to another folder"
+msgstr "ย�าย��อ�วาม�ี��ลือ���ยั���ล��อร�อื��"
+
+#: ../mail/e-mail-reader.c:1353
+msgid "_Next Message"
+msgstr "��อ�วาม_�ั���"
+
+#: ../mail/e-mail-reader.c:1355
+msgid "Display the next message"
+msgstr "�ส����อ�วาม�ั���"
+
+#: ../mail/e-mail-reader.c:1360
+msgid "Next _Important Message"
+msgstr "��อ�วาม_สำ�ั��ั���"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Display the next important message"
+msgstr "�ส����อ�วาม�ี�สำ�ั��ั���"
+
+#: ../mail/e-mail-reader.c:1367
+msgid "Next _Thread"
+msgstr "_�ระ�ู��ั���"
+
+#: ../mail/e-mail-reader.c:1369
+msgid "Display the next thread"
+msgstr "�ส���ระ�ู��ั���"
+
+#: ../mail/e-mail-reader.c:1374
+msgid "Next _Unread Message"
+msgstr "��อ�วาม�ี�ยั��ม����อ�า�_�ั���"
+
+#: ../mail/e-mail-reader.c:1376
+msgid "Display the next unread message"
+msgstr "�ส����อ�วาม�ั����ี�ยั��ม�อ�า�"
+
+#: ../mail/e-mail-reader.c:1381
+msgid "_Previous Message"
+msgstr "��อ�วาม_��อ�ห��า"
+
+#: ../mail/e-mail-reader.c:1383
+msgid "Display the previous message"
+msgstr "�ส����อ�วาม��อ�ห��า"
+
+#: ../mail/e-mail-reader.c:1388
+msgid "Pr_evious Important Message"
+msgstr "��อ�วามสำ�ั�_��อ�ห��า"
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Display the previous important message"
+msgstr "�ส����อ�วามสำ�ั���อ�ห��า"
+
+#: ../mail/e-mail-reader.c:1395
+msgid "P_revious Unread Message"
+msgstr "��อ�วาม�ี�ยั��ม����อ�า�_��อ�ห��า"
+
+#: ../mail/e-mail-reader.c:1397
+msgid "Display the previous unread message"
+msgstr "�ส����อ�วาม�ี�ยั��ม�อ�า���อ�ห��า"
+
+#: ../mail/e-mail-reader.c:1404
+msgid "Print this message"
+msgstr "�ิม����อ�วาม�ี�"
+
+#: ../mail/e-mail-reader.c:1411
+msgid "Preview the message to be printed"
+msgstr "�ู�ัวอย�า���อ�วาม��อ��ิม��"
+
+#: ../mail/e-mail-reader.c:1416
+msgid "Re_direct"
+msgstr "��ลี�ย��_ส���า�"
+
+#: ../mail/e-mail-reader.c:1418
+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
+msgid "Reply to _All"
+msgstr "�อ��ลั��ั��ห_ม�"
+
+#: ../mail/e-mail-reader.c:1425
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "��ีย��มล�อ���ยั��ู�รั��ุ����อ���อ�วาม�ี��ลือ�อยู�"
+
+#: ../mail/e-mail-reader.c:1430
+msgid "Reply to _List"
+msgstr "�อ��ลั����า_ลิส��"
+
+#: ../mail/e-mail-reader.c:1432
+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
+msgid "_Reply to Sender"
+msgstr "_�อ��ลั��ู�ส��"
+
+#: ../mail/e-mail-reader.c:1439
+msgid "Compose a reply to the sender of the selected message"
+msgstr "��ีย��มล�อ���ยั��ู�ส����อ�วาม�ี��ลือ�อยู�"
+
+#: ../mail/e-mail-reader.c:1444
+msgid "_Save as mbox..."
+msgstr "�ั��ึ����� mbox..."
+
+#: ../mail/e-mail-reader.c:1446
+msgid "Save selected messages as an mbox file"
+msgstr "�ั��ึ���อ�วาม�ี��ลือ�ล��������ม mbox"
+
+#: ../mail/e-mail-reader.c:1451
+msgid "Search Folder from Mailing _List..."
+msgstr "สร�า���ล��อร����หา�า��_มลลิ�ลิส��..."
+
+#: ../mail/e-mail-reader.c:1453
+msgid "Create a search folder for this mailing list"
+msgstr "สร�า���ล��อร����หาสำหรั��มลลิ�ลิส���ี�"
+
+#: ../mail/e-mail-reader.c:1458
+msgid "Search Folder from Recipien_ts..."
+msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_รั�..."
+
+#: ../mail/e-mail-reader.c:1460
+msgid "Create a search folder for these recipients"
+msgstr "สร�า���ล��อร����หาสำหรั��ู�รั��หล�า�ี�"
+
+#: ../mail/e-mail-reader.c:1465
+msgid "Search Folder from Sen_der..."
+msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_ส��..."
+
+#: ../mail/e-mail-reader.c:1467
+msgid "Create a search folder for this sender"
+msgstr "สร�า���ล��อร����หาสำหรั��ู�ส���ี�"
+
+#: ../mail/e-mail-reader.c:1472
+msgid "Search Folder from S_ubject..."
+msgstr "สร�า���ล��อร����หา�า��ื�อ�_รื�อ�..."
+
+#: ../mail/e-mail-reader.c:1474
+msgid "Create a search folder for this subject"
+msgstr "สร�า���ล��อร����หาสำหรั��ื�อ�รื�อ��ี�"
+
+#: ../mail/e-mail-reader.c:1479
+msgid "_Message Source"
+msgstr "��อมูล_�ิ��อ���อ�วาม"
+
+#: ../mail/e-mail-reader.c:1481
+msgid "Show the raw email source of the message"
+msgstr "�ส����อมูล�ิ��อ�อี�มล�อ���อ�วาม"
+
+#: ../mail/e-mail-reader.c:1493
+msgid "_Undelete Message"
+msgstr "�รีย�_�ื���อ�วาม�ี�ล�"
+
+#: ../mail/e-mail-reader.c:1495
+msgid "Undelete the selected messages"
+msgstr "�รีย��ื���อ�วามล��ล�ว�ี��ลือ�"
+
+#: ../mail/e-mail-reader.c:1500
+msgid "_Normal Size"
+msgstr "��า�_���ิ"
+
+#: ../mail/e-mail-reader.c:1502
+msgid "Reset the text to its original size"
+msgstr "�ั����า�อั�ษร��อ�วาม�ลั�����า��ิม"
+
+#: ../mail/e-mail-reader.c:1507
+msgid "_Zoom In"
+msgstr "_�ยาย���า"
+
+#: ../mail/e-mail-reader.c:1509
+msgid "Increase the text size"
+msgstr "��ิ�ม��า�อั�ษร��อ�วาม"
+
+#: ../mail/e-mail-reader.c:1514
+msgid "Zoom _Out"
+msgstr "�ยาย_ออ�"
+
+#: ../mail/e-mail-reader.c:1516
+msgid "Decrease the text size"
+msgstr "ล���า�อั�ษร��อ�วาม"
+
+#: ../mail/e-mail-reader.c:1523
+msgid "Create R_ule"
+msgstr "สร�า�_��"
+
+#: ../mail/e-mail-reader.c:1530
+msgid "Ch_aracter Encoding"
+msgstr "_รหัสอั��ระ"
+
+#: ../mail/e-mail-reader.c:1537
+msgid "F_orward As"
+msgstr "ส��_��อ����"
+
+#: ../mail/e-mail-reader.c:1544
+msgid "_Go To"
+msgstr "��_ยั�"
+
+#: ../mail/e-mail-reader.c:1551
+msgid "Mar_k As"
+msgstr "�ำ�_�รื�อ�หมาย����"
+
+#: ../mail/e-mail-reader.c:1558
+msgid "_Message"
+msgstr "_��อ�วาม"
+
+#: ../mail/e-mail-reader.c:1565
+msgid "_Zoom"
+msgstr "_�ยาย"
+
+#: ../mail/e-mail-reader.c:1590
+msgid "Mark for Follo_w Up..."
+msgstr "�ำ��รื�อ�หมายว�า�ะ_�อ��ระ�ู�..."
+
+#: ../mail/e-mail-reader.c:1598
+msgid "Mark as _Important"
+msgstr "�ำ��รื�อ�หมายว�า_สำ�ั�"
+
+#: ../mail/e-mail-reader.c:1602
+msgid "Mark as _Junk"
+msgstr "�ำ��รื�อ�หมาย�����มล_�ยะ"
+
+#: ../mail/e-mail-reader.c:1606
+msgid "Mark as _Not Junk"
+msgstr "�ำ��รื�อ�หมายว�า�ม�����ม_ล�ยะ"
+
+#: ../mail/e-mail-reader.c:1610
+msgid "Mar_k as Read"
+msgstr "�ำ��รื�อ�หมาย_อ�า��ล�ว"
+
+#: ../mail/e-mail-reader.c:1614
+msgid "Mark as Uni_mportant"
+msgstr "�ำ��รื�อ�หมายว�า�_ม�สำ�ั�"
+
+#: ../mail/e-mail-reader.c:1618
+msgid "Mark as _Unread"
+msgstr "�ำ��รื�อ�หมายว�า_ยั��ม�อ�า�"
+
+#: ../mail/e-mail-reader.c:1654
+msgid "_Caret Mode"
+msgstr "����_�อร���อร�"
+
+#: ../mail/e-mail-reader.c:1656
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "�ส����อร���อร��ะ�ริ�����ื�อ�วาม�อ���อ�วาม�ี��ส��"
+
+#: ../mail/e-mail-reader.c:1662
+msgid "All Message _Headers"
+msgstr "ส�ว�_หัว�อ���อ�วาม�ั��หม�"
+
+#: ../mail/e-mail-reader.c:1664
+msgid "Show messages with all email headers"
+msgstr "�ส����อ�วาม�ร�อม��วยส�ว�หัว�อ�อี�มล�ั��หม�"
+
+#: ../mail/e-mail-reader.c:1897
+msgid "Unable to retrieve message"
+msgstr "�ึ���อ�วาม�ม�สำ�ร��"
+
+#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/mail-ops.c:1849
+#, 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
+#: ../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
+msgid "_Forward"
+msgstr "ส��_��อ"
+
+#: ../mail/e-mail-reader.c:2593
+msgid "Forward the selected message to someone"
+msgstr "ส����อ��อ�วาม�ี��ลือ���ยั��ู�อื��"
+
+#: ../mail/e-mail-reader.c:2637 ../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
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "�ั���"
+
+#: ../mail/e-mail-reader.c:2645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "��อ�ห��า"
+
+#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "�อ��ลั�"
+
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+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
+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
+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
+msgid "SSL encryption"
+msgstr "���ารหัสลั���วย SSL"
+
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "��อ��ล��าร���สิ��ิ� %s "
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -11717,118 +10174,154 @@ msgstr ""
 "สำหรั� %s �ี��ส����า�ล�า��ี�\n"
 "�ละ�ำ��รื�อ�หมาย�ี��ล�อ��า��รื�อ�หมาย��ื�อ�ส���ารยอมรั�\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "�ลือ���ล��อร�"
+#. 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
+msgctxt "mail-signature"
+msgid "None"
+msgstr "�ม�มี"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "สร�า���ยอั���มั�ิ"
+#: ../mail/em-account-editor.c:965
+msgid "Never"
+msgstr "�ม����"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:966
+msgid "Always"
+msgstr "����สมอ"
+
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "�ามสำหรั����ละ��อ�วาม"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
-msgid "Identity"
-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
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../mail/em-account-editor.c:2061
+msgid "Mail Configuration"
+msgstr "�าร�ำห����า�มล"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2062
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"ยิ��ี��อ�รั�สู���รื�อ�มือ��วย�ำห����า�มล Evolution\n"
+"\n"
+"�ลิ� \"�ั���\" ��ื�อ�ริ�ม"
+
+#: ../mail/em-account-editor.c:2065
+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 "
+"information in email you send."
+msgstr ""
+"�รุ�า��อ���อมูล�ื�อ�ละ�ี�อยู�อี�มล�อ��ุ���า�ล�า��ี� ส�ว�����อ� \"��อมูล�สริม\" �ั�� "
+"�ุ��ม��ำ������อ���ิม��อมูล �ว���สีย���ว�า�ุ�อยา��ะ�ห���อมูล�ั���รา��อยู���อี�มล�ี��ุ�ส��"
+
+#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "�ารรั�อี�มล"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2068
+msgid "Please configure the following account settings."
+msgstr "�รุ�า�ั����า��า�� ��อ���ี��ห��ั��ั��ี"
+
+#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+msgid "Sending Email"
+msgstr "�ารส��อี�มล"
+
+#: ../mail/em-account-editor.c:2071
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"�รุ�า��อ���อมูล��ี�ยว�ั�วิ�ี�ารส���มล�อ��ุ� ��า�ม�มั�����ห�ลอ��าม�ู��ู�ลระ�� "
+"หรือ�ู��ห��ริ�ารอิ���อร������อ��ุ�"
+
+#: ../mail/em-account-editor.c:2073
+msgid "Account Management"
+msgstr "�าร�ั��าร�ั��ี�ู����"
+
+#: ../mail/em-account-editor.c:2074
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"�รุ�า��อ��ื�อ�ี��รรยาย�ั��ี�ี�����อ�ว�า���า�ล�า�\n"
+"�ื�อ�ี��ะ�����ื�อ�าร�ส���ล���า�ั��"
+
+#: ../mail/em-account-editor.c:2078
+msgid "Done"
+msgstr "�สร���ล�ว"
+
+#: ../mail/em-account-editor.c:2079
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"�อ�ส���วามยิ��ี �าร�ำห����า�มล�อ��ุ��สร��สม�ูร���ล�ว\n"
+"\n"
+"��ะ�ี��ุ�สามาร�รั��ละส��อี�มล��วย Evolution ����ล�ว\n"
+"\n"
+"�� \"�ริ�ม���\" ��ื�อ�ั��ึ��าร�ั����า�อ��ุ�"
+
+#: ../mail/em-account-editor.c:2520
 msgid "Check for _new messages every"
 msgstr "_�รว��มล�หม��ุ� �"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2528
 msgid "minu_tes"
 msgstr "�า_�ี"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
-msgid "Sending Email"
-msgstr "�ารส��อี�มล"
-
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
-msgid "Defaults"
-msgstr "��า�ริยาย"
-
-#. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
 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:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
 msgid "Receiving Options"
 msgstr "�ัว�ลือ��ารรั��มล"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
 msgid "Checking for New Messages"
 msgstr "�าร�รว�สอ���อ�วาม�หม�"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3418
 msgid "Account Editor"
 msgstr "ห��า��า�������ั��ี"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3418
 msgid "Evolution Account Assistant"
 msgstr "��รื�อ�มือ��วย�ั����า�ั��ี Evolution"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
-msgid "[Default]"
-msgstr "[�ั��ีหลั�]"
-
-#: ../mail/em-account-prefs.c:488
-msgid "Account name"
-msgstr "�ื�อ�ั��ี"
-
-#: ../mail/em-account-prefs.c:490
-msgid "Protocol"
-msgstr "��ร���อล"
-
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1203 ../mail/mail-signature-editor.c:478
-msgid "Unnamed"
-msgstr "�ม�มี�ื�อ"
-
-#: ../mail/em-composer-prefs.c:970
-msgid "Language(s)"
-msgstr "ภาษา"
-
-#: ../mail/em-composer-prefs.c:1019
-msgid "Add signature script"
-msgstr "��ิ�มส�ริ���สำหรั�ลาย����"
-
-#: ../mail/em-composer-prefs.c:1061
-msgid "Signature(s)"
-msgstr "ลาย����"
-
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
-msgid "-------- Forwarded Message --------"
-msgstr "-------- ��อ�วามส����อ --------"
-
-#: ../mail/em-composer-utils.c:1602
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "�ม�มี�ี�อยู��ลาย�า� ย��ลิ��ารส����อ��อ�วาม"
+#. 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
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "��อ�วาม�อ��ุ��ี�ส���ึ� %s �รื�อ� \"%s\" �มื�อ %s �ู���ิ�อ�า��รีย�ร�อย�ล�ว"
 
-#: ../mail/em-composer-utils.c:1608
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "�ม�มี�ั��ี�ี��ะ��� ย��ลิ��ารส����อ��อ�วาม"
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1626
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "�าร�����าร��ิ�อ�า���อ�วามสำหรั�: \"%s\""
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:1950
 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:2105
+#: ../mail/em-composer-utils.c:1997
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11836,13 +10329,21 @@ msgstr ""
 "�มื�อ ${AbbrevWeekdayName} ${Year}-${Month}-${Day} �วลา ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} ��ีย�ว�า:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2141
 msgid "-----Original Message-----"
 msgstr "-------- ��อ�วาม��ิม --------"
 
-#: ../mail/em-filter-editor.c:156
-msgid "_Filter Rules"
-msgstr "_���าร�รอ�"
+#: ../mail/em-composer-utils.c:2322
+msgid "Posting destination"
+msgstr "�ี��ี��ะ��ะ�ระ�าศ"
+
+#: ../mail/em-composer-utils.c:2323
+msgid "Choose folders to post the message to."
+msgstr "�ลือ���ล��อร��ี��ะ��ะ�ระ�าศ��อ�วาม"
+
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "�ลือ���ล��อร�"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11857,26 +10358,14 @@ 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 "�สร���มื�อ"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "�ั�ลอ���ยั���ล��อร�"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "วั�รั�"
@@ -11885,14 +10374,6 @@ msgstr "วั�รั�"
 msgid "Date sent"
 msgstr "วั�ส��"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "ล�"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "ล����ล�ว"
@@ -11937,229 +10418,172 @@ msgstr "�ิ����"
 msgid "Follow Up"
 msgstr "�าร�าม�ระ�ู�"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
-msgid "Important"
-msgstr "สำ�ั�"
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "ส����อ�ึ�"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "หลั�"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "��อ�"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "�ั����ว�"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "�ม�����ั����ว�"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "�ม��ู��ลือ��ว�"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "�ู��ลือ��ว�"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "�มล�ยะ"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "��สอ��มล�ยะ"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "��าย"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "�มลลิ�ลิส��"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "�ี��หลือ�ั��หม�"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "�ัว��อ�วาม"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "ส�ว�หัว��อ�วาม"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "��อ�วาม�����มล�ยะ"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "��อ�วาม�ม�����มล�ยะ"
 
-#: ../mail/em-filter-i18n.h:49
-msgid "Move to Folder"
-msgstr "ย�าย��ยั���ล��อร�"
-
 #: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "�ำ�ห��������อ���อ�วาม"
+
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
-msgstr "ส���ห���ร��รม"
+msgstr "ส�������ห���ร��รม"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "�ล���สีย�"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "อ�า��ล�ว"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "�ู�รั�"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "�����วย Regex"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "�อ����ล�ว"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "�ื���า"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "�ื���ามา��ว�า"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "�ื���า��อย�ว�า"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "�รีย���ร��รม"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "�ะ���"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "�ู�ส��"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "�ู�ส��หรือ�ู�รั�"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
-msgstr "�ำห����าย�ื�อ"
+msgstr "�ำห����าย"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "�ำห��ส�า�ะ"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "��า� (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "ออ��สีย��ล�าย�ั�"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "�ั��ี����า�"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "��อมูลส�ว�หัว"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "�ริ�ม��วย"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "หยุ��ระมวล�ล��อ"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
-msgid "Subject"
-msgstr "�รื�อ�"
-
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "ย��ลิ�ส�า�ะ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "�ล�ว"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "��ิ�ม�าร_�ระ�ำ"
 
-#: ../mail/em-folder-browser.c:193
-msgid "C_reate Search Folder From Search..."
-msgstr "_สร�า���ล��อร����หา�า��าร���หา..."
-
-#: ../mail/em-folder-browser.c:218
-msgid "All Messages"
-msgstr "�ุ���อ�วาม"
-
-#: ../mail/em-folder-browser.c:219
-msgid "Unread Messages"
-msgstr "��อ�วาม�ี�ยั��ม����อ�า�"
-
-#: ../mail/em-folder-browser.c:221
-msgid "No Label"
-msgstr "�ม�มี��าย"
-
-#: ../mail/em-folder-browser.c:228
-msgid "Read Messages"
-msgstr "��อ�วาม�ี�อ�า��ล�ว"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Recent Messages"
-msgstr "��อ�วามล�าสุ�"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Last 5 Days' Messages"
-msgstr "��อ�วามภาย�� 5 วั���อ�"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Messages with Attachments"
-msgstr "��อ�วาม�ี�มี���ม���"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Important Messages"
-msgstr "��อ�วามสำ�ั�"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Messages Not Junk"
-msgstr "��อ�วาม�ี��ม�����มล�ยะ"
-
-#: ../mail/em-folder-browser.c:1188
-msgid "Account Search"
-msgstr "�าร���หา�ั��ี"
-
-#: ../mail/em-folder-browser.c:1241
-msgid "All Account Search"
-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
 msgid "Unread messages:"
@@ -12185,70 +10609,58 @@ msgstr "�าร�����ว��า (%s):"
 msgid "Quota usage"
 msgstr "�าร�����ว��า"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2598 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
-msgid "Inbox"
-msgstr "��หมาย���า"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:399
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "�ุ�สม�ั�ิ��ล��อร�"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<�ลิ��ี��ี���ื�อ�ลือ���ล��อร�>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "_สร�า�"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "�ื�อ�_�ล��อร�:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../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
 msgid "Search Folders"
 msgstr "��ล��อร����หา"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "�ม��ร�"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
-msgid "Drafts"
-msgstr "��หมายร�า�"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "�ม����"
-
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
-msgid "Outbox"
-msgstr "��หมายออ�"
-
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
-msgid "Sent"
-msgstr "ส���ล�ว"
-
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "�ำลั��หล�..."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "�ำลั��รว���ล��อร���า�� �� \"%s\""
+
+#: ../mail/em-folder-tree.c:601
+msgid "Folder names cannot contain '/'"
+msgstr "�ื�อ��ล��อร�มี '/' �ม����"
+
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
@@ -12258,374 +10670,134 @@ msgstr "�ำลั��หล�..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:1083
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:1289
 msgid "Mail Folder Tree"
 msgstr "ลำ�ั��ั����ล��อร��มล"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "�ำลั�ย�าย��ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "�ำลั��ั�ลอ���ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2100
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "�ำลั�ย�าย��อ�วาม��ยั���ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2102
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "�ำลั��ั�ลอ���อ�วาม��ยั���ล��อร� %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:1515
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�ม�สามาร�วา���อ�วามล����หล������ระ�ั���สุ����"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
-msgid "_Copy to Folder"
-msgstr "_�ั�ลอ���ยั���ล��อร�"
-
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
-msgid "_Move to Folder"
-msgstr "_ย�าย��ยั���ล��อร�"
-
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "�ำลั��รว���ล��อร���า�� �� \"%s\""
-
-#: ../mail/em-folder-tree.c:2117
-msgid "Open in _New Window"
-msgstr "�_�ิ���ห��า��า��หม�"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
-msgid "_New Folder..."
-msgstr "�_�ล��อร��หม�..."
-
-#: ../mail/em-folder-tree.c:2125
-msgid "_Move..."
-msgstr "_ย�าย..."
-
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "�รั��_ส��"
-
-#: ../mail/em-folder-tree.c:2134
-msgid "Fl_ush Outbox"
-msgstr "_�ั�ส����หมายออ�"
+#: ../mail/em-folder-utils.c:386
+msgid "Move Folder To"
+msgstr "ย�าย��ล��อร���ยั�"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "�_��ยะ"
-
-#: ../mail/em-folder-tree.c:2243
-msgid "_Unread Search Folder"
-msgstr "��ล��อร����หา�ี�ยั��_ม�อ�า�"
-
-#: ../mail/em-folder-utils.c:101
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "�ำลั��ั�ลอ� `%s' ��ยั� `%s'"
-
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
-msgid "Select folder"
-msgstr "�ลือ���ล��อร�"
-
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
-msgid "C_opy"
-msgstr "_�ั�ลอ�"
+#: ../mail/em-folder-utils.c:386
+msgid "Copy Folder To"
+msgstr "�ั�ลอ���ล��อร���ยั�"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:507
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "�ำลั�สร�า���ล��อร� `%s'"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:670
+msgid "Create Folder"
 msgstr "สร�า���ล��อร�"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:671
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "ระ�ุ�ี��ี��ะสร�า���ล��อร�"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "ล��มล�ม�สำ�ร��"
-
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "�ุ��ม�มีสิ��ิ���ีย��อ�ี��ะล��มล�ี�"
-
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "_�อ��ลั��ู�ส��"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "ส��_��อ"
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
-msgid "_Edit as New Message..."
-msgstr "�_����������อ�วาม�หม�..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "U_ndelete"
-msgstr "�_ม�ล�"
-
-#: ../mail/em-folder-view.c:1344
-msgid "_Move to Folder..."
-msgstr "_ย�าย��ยั���ล��อร�..."
-
-#: ../mail/em-folder-view.c:1345
-msgid "_Copy to Folder..."
-msgstr "_�ั�ลอ���ยั���ล��อร�..."
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mar_k as Read"
-msgstr "�ำ��รื�อ�หมาย_อ�า��ล�ว"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as _Unread"
-msgstr "�ำ��รื�อ�หมายว�า_ยั��ม�อ�า�"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Important"
-msgstr "�ำ��รื�อ�หมายว�า_สำ�ั�"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as Un_important"
-msgstr "�ำ��รื�อ�หมายว�า�_ม�สำ�ั�"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark as _Junk"
-msgstr "�ำ��รื�อ�หมาย�����มล_�ยะ"
-
-#: ../mail/em-folder-view.c:1353
-msgid "Mark as _Not Junk"
-msgstr "�ำ��รื�อ�หมายว�า�ม�����ม_ล�ยะ"
-
-#: ../mail/em-folder-view.c:1354
-msgid "Mark for Follo_w Up..."
-msgstr "�ำ��รื�อ�หมายว�า�ะ_�อ��ระ�ู�..."
-
-#: ../mail/em-folder-view.c:1356
-msgid "_Label"
-msgstr "�ิ�_��าย"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
-msgid "_None"
-msgstr "�_ม��ำอะ�ร"
-
-#: ../mail/em-folder-view.c:1360
-msgid "_New Label"
-msgstr "��าย�ื�อ�_หม�"
-
-#: ../mail/em-folder-view.c:1364
-msgid "Fla_g Completed"
-msgstr "�ั��_�ว�า�สร���ล�ว"
-
-#: ../mail/em-folder-view.c:1365
-msgid "Cl_ear Flag"
-msgstr "ล�_า���"
-
-#: ../mail/em-folder-view.c:1368
-msgid "Crea_te Rule From Message"
-msgstr "สร�า�_���า���อ�วาม"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Subject"
-msgstr "สร�า���ล��อร����หา�า��ื�อ�_รื�อ�..."
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Se_nder"
-msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_ส��"
-
-#: ../mail/em-folder-view.c:1372
-msgid "Search Folder based on _Recipients"
-msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_รั�"
-
-#: ../mail/em-folder-view.c:1373
-msgid "Search Folder based on Mailing _List"
-msgstr "สร�า���ล��อร����หา�า��_มลลิ�ลิส��"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Sub_ject"
-msgstr "�รอ��ี��ื�อ�_รื�อ�"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on Sen_der"
-msgstr "�รอ��ี��ื�อ�ู�_ส��"
-
-#: ../mail/em-folder-view.c:1380
-msgid "Filter based on Re_cipients"
-msgstr "�รอ��ี��ื�อ�ู�_รั�"
-
-#: ../mail/em-folder-view.c:1381
-msgid "Filter based on _Mailing List"
-msgstr "�รอ��ี��_มลลิ�ลิส��"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:708
-msgid "Default"
-msgstr "�ริยาย"
-
-#: ../mail/em-folder-view.c:2518
-msgid "Unable to retrieve message"
-msgstr "�ึ���อ�วาม�ม�สำ�ร��"
-
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "�ำลั��ึ���อ�วาม..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "�_รีย���..."
-
-#: ../mail/em-folder-view.c:2759
-msgid "Create _Search Folder"
-msgstr "สร�า���ล��อร�_���หา"
-
-#: ../mail/em-folder-view.c:2760
-msgid "_From this Address"
-msgstr "_�า��ี�อยู��ี�"
-
-#: ../mail/em-folder-view.c:2761
-msgid "_To this Address"
-msgstr "�_��ี�อยู��ี�"
-
-#: ../mail/em-folder-view.c:3254
-#, c-format
-msgid "Click to mail %s"
-msgstr "�ลิ���ื�อส���มล��ยั� %s"
-
-#: ../mail/em-folder-view.c:3266
-#, c-format
-msgid "Click to call %s"
-msgstr "�ลิ���ื�อ�รีย���ยั� %s"
-
-#: ../mail/em-folder-view.c:3271
-msgid "Click to hide/unhide addresses"
-msgstr "�ลิ���ื�อ�ส��/��อ��ี�อยู���า��"
-
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
+#: ../mail/em-folder-utils.c:687
 #, c-format
-msgid "Matches: %d"
-msgstr "หา��: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "_หา:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "_��อ�ห��า"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "_�ั���"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "�ัว_�ิม���ห��-�ล���ร��ั�"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "�ำลั��ลิ��อ�รั���อมูล�า���ล��อร� \"%s\""
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
 msgid "Unsigned"
 msgstr "�ม�มีลาย�����ำ�ั�"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "��อ�วาม�ี��ม�มีลาย�����ำ�ั� �ม�มีอะ�ร�ระ�ั�����ลยว�า��อ�วาม�ี�����มา�า��ู�ส���ริ�"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
 msgid "Valid signature"
 msgstr "ลาย�����ู���อ�"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:104
 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:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
 msgid "Invalid signature"
 msgstr "ลาย�����ม��ู���อ�"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ลาย�����ำ�ั���อ�วาม�ี��รว�สอ��ล�ว�ม���า� ���������ว�า��อ�วามอา��ู������ระหว�า��า�"
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
 msgid "Valid signature, but cannot verify sender"
 msgstr "ลาย�����ู���อ� ����ม�สามาร��รว�สอ��ู�ส��"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:106
 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:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
 msgid "Signature exists, but need public key"
 msgstr "มีลาย���� ����ม�มี�ุ���สา�าร�ะ"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "��อ�วาม�ี�มีลาย�����ำ�ั� ����ม�มี�ุ���สา�าร�ะ�ี��ะ����รว�สอ�"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
 msgid "Unencrypted"
 msgstr "�ม�������ารหัส"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "��อ�วาม�ี��ม�������ารหัส ��ื�อหาอา��ู��ั�อ�า�ระหว�า��า���อิ���อร��������"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1551
 msgid "Encrypted, weak"
 msgstr "���ารหัส���อ�อ�"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:115
 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 "
@@ -12634,21 +10806,21 @@ msgstr ""
 "��อ�วาม�ี��ู����ารหัส ������อัล�อริ�ึม���ารหัส�ี�อ�อ� �ุ��ลอื��อา��ั�อ�า����ยา����ริ� "
 "������ม�����������ม���� ��ย����วลา�ม�มา���ิ���"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
 msgid "Encrypted"
 msgstr "���ารหัส"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:116
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "��อ�วาม�ี��ู����ารหัส �ุ��ลอื���ั�อ�า���ื�อหา���ยา�"
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
 msgid "Encrypted, strong"
 msgstr "���ารหัส�������ห�า"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:117
 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 "
@@ -12656,526 +10828,226 @@ msgid ""
 msgstr ""
 "��อ�วาม�ี��ู����ารหัส��วยอัล�อริ�ึม���ารหัส�ี�����ห�า �ุ��ลอื���ั�อ�า���ื�อหา���ยา�มา� ��วย�วลา���ิ"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_�ู��รั�รอ�"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "��รั�รอ��ี���ิ��ู�ม����"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "�สร���มื�อ %d %B %Ey %H:%M"
+#: ../mail/em-format-html-display.c:509
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution �ม�สามาร��ส���มล��ั��ี���� ��ื�อ��า�มี��า��ห����ิ��� "
+"�ุ�สามาร��ส���มล�ี�������ม��ั�รู���� หรือ�ะ��ิ���วย��รื�อ�มือ�����ภาย�อ������"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:738
+msgid "Completed on"
+msgstr "�สร���มื�อ"
+
+#: ../mail/em-format-html-display.c:746
 msgid "Overdue:"
 msgstr "�ลย�ำห��:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "ภาย�� %d %B %Ey %H:%M"
-
-#: ../mail/em-format-html-display.c:1499
-msgid "_View Inline"
-msgstr "�_ส�����รร�ั�"
-
-#: ../mail/em-format-html-display.c:1500
-msgid "_Hide"
-msgstr "_��อ�"
-
-#: ../mail/em-format-html-display.c:1501
-msgid "_Fit to Width"
-msgstr "_�อ�ี�วาม�ว�า�"
-
-#: ../mail/em-format-html-display.c:1502
-msgid "Show _Original Size"
-msgstr "�ส����า�_�ริ�"
-
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "�ั��ึ����ม�������"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "�ลือ���ล��อร��ี��ะ�ั��ึ����ม����ั��หม�"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "_�ั��ึ�ราย�าร�ี��ลือ�..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "���ม�_�� %d ��ั�"
-msgstr[1] "���ม�_�� %d ��ั�"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "_�ั��ึ�"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "�ั��ึ��ั��ห_ม�"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-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
+msgid "by"
+msgstr "��ย"
 
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
 msgid "View _Unformatted"
 msgstr "�ส������_ม��ั�รู����"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:964
 msgid "Hide _Unformatted"
 msgstr "��อ��าร�ส������_ม��ั�รู����"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1021
 msgid "O_pen With"
 msgstr "�_�ิ���วย"
 
-#: ../mail/em-format-html-display.c:2668
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution �ม�สามาร��ส���มล��ั��ี���� ��ื�อ��า�มี��า��ห����ิ��� "
-"�ุ�สามาร��ส���มล�ี�������ม��ั�รู���� หรือ�ะ��ิ���วย��รื�อ�มือ�����ภาย�อ������"
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "ห��า %d �า� %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "�ำลั��ั��รีย���อ�วาม"
+
+#: ../mail/em-format-html.c:356
+msgid "Formatting Message..."
+msgstr "�ำลั��ั��รีย���อ�วาม..."
+
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "�ำลั��ึ� `%s'"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:1859
 msgid "Unknown external-body part."
 msgstr "��อ�วามส�ว�ภาย�อ��ี��ม�รู��ั�"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:1867
 msgid "Malformed external-body part."
 msgstr "��อ�วามส�ว�ภาย�อ��ิ�รู����"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:1897
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�ัว�ี���ยั��หล�� FTP (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:1908
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�ัว�ี���ยั����ม����รื�อ� (%s) ������สำหรั���รื�อ� \"%s\""
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�ัว�ี���ยั����ม����รื�อ� (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1931
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�ัว�ี���ยั���อมูล����รือ��าย (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1942
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�ัว�ี���ยั���อมูลภาย�อ��ี��ม�รู��ั� (��ิ� \"%s\")"
 
-#: ../mail/em-format-html.c:1241
-msgid "Formatting message"
-msgstr "�ำลั��ั��รีย���อ�วาม"
-
-#: ../mail/em-format-html.c:1415
-msgid "Formatting Message..."
-msgstr "�ำลั��ั��รีย���อ�วาม..."
-
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
-msgid "Cc"
-msgstr "สำ��า�ึ�"
-
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
-msgid "Bcc"
-msgstr "สำ��าลั��ึ�"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1459
-msgid "Mailer"
-msgstr "��ร��รมส���มล"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. 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:1917
+#: ../mail/em-format-html.c:2602
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "��อ�วาม�ี��ู�ส����ย <b>%s</b> ���าม�อ� <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "�า�"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
-msgid "Reply-To"
-msgstr "�ี�อยู��อ��ลั�"
-
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
-msgid "Date"
-msgstr "วั��ี�"
-
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
-msgid "Newsgroups"
-msgstr "�ลุ�ม��าว"
-
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "รู���าย"
-
-#: ../mail/em-format.c:1160
-#, c-format
-msgid "%s attachment"
-msgstr "���ม��� %s"
-
-#: ../mail/em-format.c:1199
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "�ม�สามาร������อ�วาม S/MIME: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
-
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "�ม�สามาร������อ�วาม MIME �ะ�ส����อ�วาม�����ั�"
-
-#: ../mail/em-format.c:1344
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "��ิ��าร���ารหัสลั��ี��ม�รอ�รั�สำหรั� multipart/encrypted"
-
-#: ../mail/em-format.c:1354
-msgid "Could not parse PGP/MIME message"
-msgstr "�ม�สามาร������อ�วาม PGP/MIME"
-
-#: ../mail/em-format.c:1354
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "�ม�สามาร������อ�วาม PGP/MIME: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
-
-#: ../mail/em-format.c:1511
-msgid "Unsupported signature format"
-msgstr "รู����ลาย�����ี��ม�รอ�รั�"
-
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
-msgid "Error verifying signature"
-msgstr "��ิ���อ�ิ��ลา���ะ�รว�สอ�ลาย����"
-
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
-msgid "Unknown error verifying signature"
-msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ��ะ�รว�สอ�ลาย����"
-
-#: ../mail/em-format.c:1664
-msgid "Could not parse PGP message"
-msgstr "�ม�สามาร������อ�วาม PGP"
-
-#: ../mail/em-format.c:1664
-msgid "Could not parse PGP message: Unknown error"
-msgstr "�ม�สามาร������อ�วาม PGP: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
-
-#: ../mail/em-mailer-prefs.c:94
-msgid "Every time"
-msgstr "�ุ��วลา"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Once per day"
-msgstr "ห�ึ���รั����อวั�"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per week"
-msgstr "ห�ึ���รั����อสั��าห�"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per month"
-msgstr "ห�ึ���รั����อ��ือ�"
-
-#: ../mail/em-mailer-prefs.c:333
-msgid "Add Custom Junk Header"
-msgstr "��ิ�ม��อมูลส�ว�หัว�ำห���อ��อ��ยะ"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Name:"
-msgstr "�ื�อ��อมูลส�ว�หัว:"
-
-#: ../mail/em-mailer-prefs.c:338
-msgid "Header Value Contains:"
-msgstr "��อมูลส�ว�หัวมี�ำว�า:"
-
-#: ../mail/em-mailer-prefs.c:444
-msgid "Contains Value"
-msgstr "มี�ำว�า"
-
-#: ../mail/em-mailer-prefs.c:467
-msgid "Color"
-msgstr "สี"
-
-#: ../mail/em-mailer-prefs.c:470
-msgid "Tag"
-msgstr "��าย"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1141
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "มี�ลั��อิ� %s �ละ����ิ��ั�����ารี�ว��ล�ว"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1095 ../mail/em-mailer-prefs.c:1150
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr "�ม�มี�ลั��อิ� %s �รุ�า�รว�สอ�ว�า����ิ��ั��������หรือ�ม�"
-
-#: ../mail/em-mailer-prefs.c:1116
-msgid "No Junk plugin available"
-msgstr "�ม�มี�ลั��อิ��รว��ยะ"
-
-#. green
-#: ../mail/em-migrate.c:1059
-msgid "To Do"
-msgstr "�ะ�ำ"
-
-#. blue
-#: ../mail/em-migrate.c:1060
-msgid "Later"
-msgstr "�ว��ีหลั�"
-
-#: ../mail/em-migrate.c:1228
-msgid "Migration"
-msgstr "�ารย�าย��อมูล"
-
-#: ../mail/em-migrate.c:1673
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "�ม�สามาร�สร�า���ล��อร��หม� `%s': %s"
-
-#: ../mail/em-migrate.c:1699
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "�ม�สามาร��ั�ลอ���ล��อร� `%s' ��ยั� `%s': %s"
-
-#: ../mail/em-migrate.c:1884
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "�ม�สามาร��รว�หา�ล�อ��มล�ี�มีอยู��ี� `%s': %s"
-
-#: ../mail/em-migrate.c:1889
-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/em-migrate.c:2090
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "�ม�สามาร���ิ���อมูล POP ���า `%s' ��ิ������ว��ี���ิร���วอร�: %s"
-
-#: ../mail/em-migrate.c:2104
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "�ม�สามาร�สร�า����ร��อรี��อมูล POP3 `%s' ��ิ������ว��ี���ิร���วอร�: %s"
-
-#: ../mail/em-migrate.c:2133
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "�ม�สามาร��ั�ลอ���อมูล POP3 `%s' ��ิ������ว��ี���ิร���วอร�: %s"
-
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "�ม�สามาร�สร�า��ี������มล��อ��ิ�� `%s': %s"
-
-#: ../mail/em-migrate.c:2974
-msgid "Migrating Folders"
-msgstr "�ำลั�ย�าย��อมูล��ล��อร���า��"
-
-#: ../mail/em-migrate.c:2974
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"��ร�สร�า�สรุ��อ���ล��อร��ล�อ��มล�อ� Evolution ��ลี�ย������ SQLite �ั����� Evolution "
-"2.24\n"
-"\n"
-"�รุ�าอ���รอ ��ะ�ี� Evolution ย�าย��อมูล��ล��อร��อ��ุ�..."
-
-#: ../mail/em-migrate.c:3056
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "�ม�สามาร�สร�า���ล��อร��มล��อ��ิ�� `%s': %s"
-
-#: ../mail/em-migrate.c:3075
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"�ม�สามาร�อ�า���า�ั���า��าร�ิ��ั���รั����อ��อ� Evolution �ม�มี���ม `evolution/config.xmldb' "
-"หรือ���ม�สียหาย"
-
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
-msgid "_Reply to sender"
-msgstr "_�อ���ยั��ู�ส��"
-
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _List"
-msgstr "�อ��ลั����า_ลิส��"
-
-#. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:848
-msgid "_Add to Address Book"
-msgstr "�_�ิ�ม��สมุ��ี�อยู�"
-
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�หล�������ี��ม�รอ�รั��าร�อ�รั� หรือ�ม������ิ��ห��อ�รั����"
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "�อ�รั��ล�ว"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "��ล��อร�"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:844
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "�รุ�า�ลือ���ิร���วอร�"
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "�ม�����ลือ���ิร���วอร�"
 
-#. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "�_ม���อ��ส����อ�วาม�ี�อี�"
-
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "�ัว�รอ���อ�วาม"
 
-#: ../mail/em-utils.c:371
-msgid "message"
-msgstr "��อ�วาม"
-
-#: ../mail/em-utils.c:655
-msgid "Save Message..."
-msgstr "�ั��ึ���อ�วาม..."
-
-#: ../mail/em-utils.c:705
-msgid "Add address"
-msgstr "��ิ�ม�ี�อยู�"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:814
 #, c-format
 msgid "Messages from %s"
 msgstr "��อ�วาม�า� %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "�_�ล��อร����หา"
 
-#: ../mail/em-vfolder-rule.c:593
-msgid "Search Folder source"
-msgstr "�หล��สำหรั���ล��อร����หา"
+#: ../mail/em-vfolder-rule.c:522
+msgid "Add Folder"
+msgstr "��ิ�ม��ล��อร�"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "�วามสู�ห��า��า� \"��รื�อ�มือ������ัว�รอ�\""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "ส�า�ะ�าร�ยาย���ม�อ�ห��า��า� \"��รื�อ�มือ������ัว�รอ�\""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "�วาม�ว�า��อ�ห��า��า� \"��รื�อ�มือ������ัว�รอ�\""
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Search Folder Editor\" window height"
+msgstr "�วามสู�ห��า��า� \"��รื�อ�มือ�������ล��อร����หา\""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "ส�า�ะ�าร�ยาย���ม�อ�ห��า��า� \"��รื�อ�มือ�������ล��อร����หา\""
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Search Folder Editor\" window width"
+msgstr "�วาม�ว�า��อ�ห��า��า� \"��รื�อ�มือ�������ล��อร����หา\""
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "�วามสู��อ�ห��า��า� \"รั��ละส���มล\""
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "ส�า�ะ�าร�ยาย���ม�อ�ห��า��า� \"รั��ละส���มล\""
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "�วาม�ว�า��อ�ห��า��า� \"รั��ละส���มล\""
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../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:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ร�อ��อ�ห�ส���าร����รั���อ�วาม�สมอ"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "�รว�รู�ห��า�ส��อารม�����ยอั���มั�ิ"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "�รว�รู�ลิ�����ยอั���มั�ิ"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "�รว�สอ���หมาย���าว�า�����มล�ยะหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "สี�����ารอ�า��ำ�ู�"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "สีสำหรั������ารอ�า��ำ�ู�"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "�วามสู��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "���ร��อรีสำหรั�อ�า�/������มสำหรั���รื�อ�มือ��ีย���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "�ำ�ั��าร�ส��ราย�าร�ี�อยู�����อ� �ึ�/สำ��า�ึ�/สำ��าลั��ึ�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -13183,7 +11055,7 @@ msgstr ""
 "�ำ�ั��าร�ส��ราย�าร�ี�อยู�����อ� �ึ�/สำ��า�ึ�/สำ��าลั��ึ� �ม��ห���ิ��ำ�ว��ี�ระ�ุ�� "
 "address_count"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -13191,80 +11063,84 @@ msgstr ""
 "�ำห���วาม�ี��อ��าร�รั���อมูลระหว�า��าร��ลี�ย���ล�����รื�อ��ั���ิร���วอร��มล����รือ��าย�ห��ร��ั� "
 "��ว��วลา��อ��ม���ำ�ว�า 30 วิ�า�ี"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "��อมูลส�ว�หัว�ี��ะ�����ะ�รว�หา�ยะ"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 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:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ�����ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ�����ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ����ส����หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "รหัสอั��ระ�ริยาย�ี��ะ����ส����หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "รู�����ริยาย�อ��ารส����อ��อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "�วามสู��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "�วามสู��ริยาย�อ�ห��า��า���อ�วาม"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default height of the mail browser window."
+msgstr "�วามสู��ริยาย�อ�ห��า��า��ส���มล"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "�วามสู��ริยาย�อ��ล�อ�����อ��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default maximized state of the mail browser window."
+msgstr "ส�า�ะ�าร�ยาย���ม��ย�ริยาย�อ�ห��า��า��ส���มล"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "รู�����ริยาย�อ��าร�อ���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "ส�า�ะ�ริยาย�อ��าร�ยาย�ระ�ู�"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���ีย���หมาย"
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���อ�วาม"
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Default width of the mail browser window."
+msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า��ส���มล"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "�วาม�ว�า��ริยาย�อ��ล�อ�����อ��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "�ำห��ว�า ���าร�รอ��ยะ �ะ��ิ�หา�ี�อยู��ู�ส����สมุ��ี�อยู�����รื�อ����า�ั��หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "�ำห��ว�า�ะ��ิ�หา�ี�อยู��ู�ส����สมุ��ี�อยู�หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 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 "
@@ -13275,11 +11151,11 @@ msgstr ""
 "�ะ��ิ���สมุ��ี��ู��ลือ��ว�สำหรั���ิม���ม�ี�อยู����อั���มั�ิ �ึ��อา��ะ��า��าสมุ��ั��ล�าวอยู�����รือ��าย "
 "(���� LDAP)"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "�ำห��ว�า�ะ�����อมูลส�ว�หัว�ำห���อ�สำหรั��รว��ยะหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 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 "
@@ -13288,7 +11164,7 @@ msgstr ""
 "�ำห��ว�า�ะ�����อมูลส�ว��ี�หัว�ำห���อ�สำหรั��รว��ยะหรือ�ม� ��า��ิ�����ัว�ลือ��ี� "
 "�ละ��อ�วามมี��อมูลส�ว�หัว�ี��ำ�ั�มา ���ะ��วย�ห��าร�รว��ยะ�ำ���รว��ร�ว�ึ��"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -13296,70 +11172,82 @@ msgstr ""
 "�ำห��ว�า�ะ������อั�ษร��ียว�ั�สำหรั��ั���รร�ั� \"�า�\" �ละ \"�รื�อ�\" ����อ� \"��อ�วาม\" "
 "��มุมมอ�����ั��หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "���ร��อรีสำหรั�อ�า�/������มสำหรั���รื�อ�มือ��ีย���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "���ร��อรีสำหรั��ั��ึ����มส�ว��ระ�อ���า�� �อ��มล"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "�ิ�หรือ��ิ��ารละ�ื�อ��ล��อร���วย�ุ�����ลา�������า�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Do not add signature delimiter"
+msgstr "�ม���อ���ิม��รื�อ�หมาย�ั��ลาย����"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "�����ำสะ���ิ���ะ�ิม��"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "����ล��อร���อ�วาม�ยะ��อ�ออ�"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "���ั��ยะ��อ�ออ�"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "���ยะ����ล��อร���อ�วาม�ยะ�ั��หม���อ�ออ��า� Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "���ยะ����ล��อร��ั��ยะ�ั��หม���อ�ออ��า� Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"��ิ����ภา���ลื�อ��หว���มล HTML �ู�����ำ�ว�มา�รู�สึ�รำ�า��ั�ภา���ลื�อ��หว "
+"�ละ��อ��าร�ูภา��ิ��มา��ว�า"
+
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "��ิ�����หม���อร���อร� ��ื�อ�ห��ุ������อร���อร���ะอ�า��มล���"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "��ิ�หรือ�ิ��าร�����ร��ว��วรร������ุ�ม�ำ�า�ลั�"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "��ิ�หรือ�ิ��าร�าม�มื�อ�ู�����ำ��รื�อ�หมาย��อ�วามหลายราย�าร"
+
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "��ิ�หรือ�ิ��วามสามาร����าร�������ิม��ล�ว�ห��า"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "��ิ������ล��อร����หา"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "��ิ������ล��อร����หา�มื�อ�ริ�ม�ำ�า�"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"��ิ�����วามสามาร����าร���หาภาย�������า� ��ื�อ�ห��ุ�สามาร��ริ�ม�าร���หา�������อ� "
-"��วย�าร�ิม����อ�วาม �ระ�ย������ือ �ุ�สามาร�หา��ล��อร��������า������ย��ีย��ิม���ื�อ��ล��อร� "
-"�ล�ว����ลือ����ะ�ระ�����ยั���ล��อร��ั����ยอั���มั�ิ��ะ�ิม��"
+"��ิ�����วามสามาร����าร���หาภาย�������า� ��ื�อ�ห��ุ�สามาร����หา�ื�อ��ล��อร��������อ����"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13367,41 +11255,42 @@ msgstr ""
 "��ิ�����ัว�ลือ��ี���า��อ��าร�����ร��ว��วรร����าร�ลื�อ�ห��า����อ��ัวอย�า���อ�วาม ราย�าร��อ�วาม "
 "�ละ����ล��อร���า��"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "��ิ������ื�อ�ส���า�ส�ว��อ���อ�วาม����า��ี��ำ�ั�"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "��ิ�/�ิ��าร�����อร���อร�"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "ล�รหัส�ื�อ���ม������อ� Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "ล�รหัส�ื�อ���ม����อมูลส�ว�หัว�อ��มล������ี� Outlook �ละ GMail ��� "
-"��ื�อ�ห���ร��รม�ั��ล�าว���า���ื�อ���ม��ั���ล�ี� Evolution ส���ห� "
+"��ื�อ�ห���ร��รม�ั��ล�าว�ส���ื�อ���ม�ี����� UTF-8 �ี�ส���า� Evolution ���อย�า��ู���อ� "
 "��ื�อ��า���ร��รม�ั��ล�าว�ม�����ำ�าม RFC 2231 ��������มา�ร�า� RFC 2047 �ึ���ม��ู���อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "�วามสู��อ���อ�ราย�าร��อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "�วามสู��อ���อ�ราย�าร��อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "��อ��าร�ส���ัวอย�า�อี�มล�อ���ล��อร��ละย��ลิ��าร�ลือ�"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13409,13 +11298,7 @@ msgstr ""
 "��า�ู�����ยายาม��ิ���อ�วาม�ั����� 10 ��อ�วาม�ึ�����ร�อม�ั��ี��ียว �ะ�าม�ู������อ� "
 "ว�า��อ��าร��ิ��ริ�หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "��า��อ� \"�ัวอย�า���อ�วาม\" ��ิ���� �ห��ส����อ��ั��ล�าว����า���า� ����ี��ะ�รีย�����ว�ิ��"
-
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13425,13 +11308,54 @@ msgstr ""
 "�ะ���หาอ����ระ�อ� Bonobo สำหรั��ส����ิ� MIME �ี��รา����ราย�ื�อ�ี��า��า���อมูล��ิ� MIME "
 "�อ� GNOME"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"�วามสู��ั������อ�ห��า��า� \"��รื�อ�มือ������ัว�รอ�\" "
+"��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู�����าม��ว�ั��"
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"�วามสู��ั������อ�ห��า��า� \"��รื�อ�มือ�������ล��อร����หา\" "
+"��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู�����าม��ว�ั��"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
-msgstr "�วามสู��ั������อ�ห��า��า� \"รั��ละส���มล\" ��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู����"
+msgstr ""
+"�วามสู��ั������อ�ห��า��า� \"รั��ละส���มล\" ��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู�����าม��ว�ั��"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"��า�ั������อ�ส�า�ะ�าร�ยาย���ม�อ�ห��า��า� \"��รื�อ�มือ������ัว�รอ�\" "
+"��า�ี��ะ�รั��าม�าร�ยายหรือ�ลิ��ยายห��า��า����ม�อ��ู���� สั����ว�า��า�ี��ม���������ย Evolution "
+"��ื�อ��า�ห��า��า� \"��รื�อ�มือ������ัว�รอ�\" �ม�สามาร��ยาย���ม��� "
+"����ีย��ี�มี�ว���วย�ห�ุ�ล�รื�อ�รายละ�อีย��า�����ิ�"
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"��า�ั������อ�ส�า�ะ�าร�ยาย���ม�อ�ห��า��า� \"��รื�อ�มือ�������ล��อร����หา\" "
+"��า�ี��ะ�รั��าม�าร�ยายหรือ�ลิ��ยายห��า��า����ม�อ��ู���� สั����ว�า��า�ี��ม���������ย Evolution "
+"��ื�อ��า�ห��า��า� \"��รื�อ�มือ�������ล��อร����หา\" �ม�สามาร��ยาย���ม��� "
+"����ีย��ี�มี�ว���วย�ห�ุ�ล�รื�อ�รายละ�อีย��า�����ิ�"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13444,24 +11368,31 @@ msgstr ""
 "��ื�อ��า�ห��า��า� \"รั��ละส���มล\" �ม�สามาร��ยาย���ม��� "
 "����ีย��ี�มี�ว���วย�ห�ุ�ล�รื�อ�รายละ�อีย��า�����ิ�"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 msgstr ""
-"�วาม�ว�า��ั������อ�ห��า��า� \"รั��ละส���มล\" ��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู����"
+"�วาม�ว�า��ั������อ�ห��า��า� \"��รื�อ�มือ������ัว�รอ�\" "
+"��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู�����าม��ว�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "��ิ�/�ิ��าร�าม�มื�อ�ู�����ำ��รื�อ�หมาย��อ�วามหลายราย�าร"
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"�วาม�ว�า��ั������อ�ห��า��า� \"��รื�อ�มือ�������ล��อร����หา\" "
+"��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู�����าม��ว�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr "�ิ�หรือ��ิ��าร�าม��ำ� ว�า��อ��รั���อมูล���ออ��ล��หรือ�ม� ��อ��ี��ะ���าสู��หม�ออ��ล��"
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"�วาม�ว�า��ั������อ�ห��า��า� \"รั��ละส���มล\" "
+"��า�ี��ะ��ลี�ย��าม�าร�รั���า�ห��า��า��อ��ู�����าม��ว�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13470,31 +11401,35 @@ msgstr ""
 "�ิ�หรือ��ิ��าร��ือ���ำ� ว�า�ารล���อ�วาม����ล��อร����หา�ะ�����ารล���อ�วามอย�า��าวร��วย "
 "�ม��������ารล��า��ล�าร���หา���า�ั��"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "�วลา����อ�วาม�ยะ�รั��สุ���าย"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "�วลา���ยะ�รั��สุ���าย"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Layout style"
+msgstr "รู�����าร�ั�ห��า�อ"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "ราย�ื�อ��าย�ละสี�ี����"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ราย�ื�อ��ิ� MIME �ี��ะ�รว�หาอ����ระ�อ� Bonobo สำหรั��ส��"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "ราย�ื�อ�อ�สั��าอ�ุ�า��ี�ยอมรั�"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "ราย�ื�อ�ั��ี�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13502,15 +11437,15 @@ msgstr ""
 "ราย�ื�อ�ั��ี�ี�อ����ระ�อ��มล�อ� Evolution รู��ั�  ราย�ื�อ�ี�����ส�ริ������ื�อ���ร��อรีย�อย��ีย��ั� /"
 "apps/evolution/mail/accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "ราย�ื�อ��อมูลส�ว�หัว�ำห���อ� �ร�อม�ำห��ว�า��ิ����หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ราย�ื�อรหัสภาษา�อ����า�ุ�รม�ี��ะ����รว��ัวสะ��"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13518,15 +11453,15 @@ msgstr ""
 "ราย�ื�อ�อ���าย�ี������อ����ระ�อ��มล�อ� Evolution  ราย�ื�อ�ี�����ราย�าร�อ�ส�ริ���รู� �ื�อ:สี "
 "��ย���สี��วยรู�����า�สิ�ห���� HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "ราย�ื�อ��ร���อล�ี����สั��าอ�ุ�า��ี�ยอมรั�"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "�หล�รู�ภา�����อ�วาม HTML ��า� HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13536,236 +11471,354 @@ msgstr ""
 "�ม���อ��หล�รู�ภา���า���รือ��าย, \"1\" = �หล�รู�ภา����มล�า��ู��ิ���อ, \"2\" = "
 "�หล�รู�ภา���า���รือ��าย�สมอ"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "�ั��ึ��ูม�าร�รอ���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "�ั��ึ��ูม�าร�รอ���อ�วามล������ม�ูม"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "���ม�ูม�ี��ะ�ั��ึ��าร�รอ���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "���ม�ูม�ี��ะ�ั��ึ��าร�รอ���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Mail browser height"
+msgstr "�วามสู��อ�ห��า��า��ส���มล"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr "ห��า��า��ส���มล�ยาย���มอยู�"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Mail browser width"
+msgstr "�วาม�ว�า��อ�ห��า��า��ส���มล"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "�ำ��รื�อ�หมายว�าอ�า��ล�วหลั�ระยะ�วลา�ี��ำห��"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "�ำ��รื�อ�หมายว�าอ�า��ล�วหลั�ระยะ�วลา�ี��ำห��"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "�����ารอ�า��ำ�ู����ัวอย�า���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "�����ารอ�า��ำ�ู����ัวอย�า���อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Message Window default height"
-msgstr "�วามสู��ริยาย�อ�ห��า��า���อ�วาม"
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default width"
-msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���อ�วาม"
-
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "รู�����าร�ส����อ�วาม (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "�ำ�ว�วั��ี���อย�ี�สุ�ระหว�า��าร����อ�วาม�ยะ��อ�ออ����ละ�รั��"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "�ำ�ว�วั��ี���อย�ี�สุ�ระหว�า��าร���ยะ��อ�ออ����ละ�รั��"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "�วลา�ี���อย�ี�สุ�ระหว�า��าร����อ�วาม�ยะ��อ�ออ����ละ�รั�� ����วั�"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "�วลา�ี���อย�ี�สุ�ระหว�า��าร���ยะ��อ�ออ����ละ�รั�� ����วั�"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "�ำ�ว�ราย�าร�ี�อยู��ี��ะ�ส������อ� �ึ�/สำ��า�ึ�/สำ��าลั��ึ�"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "�าม�มื�อหัว�รื�อ���อ�วามว�า���ล�า"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "�าม�ู�����มื�อ�ู�����ยายาม�����วา���ล��อร�"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "�าม�ู�����มื�อ�ู�����ยายามส����อ�วาม�ี��ม�มีหัว�รื�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "�าม��ื�อ�รว�สอ�ว�า�ู������อ��ารออ��ล���ั��ีหรือ�ม�"
-
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "�าม��อ�ล���อ�วาม����ล��อร����หา"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "�าม�มื�อ�ู����สั�������วา�"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "�าม�มื�อ�ู����ระ�ุ���สำ��าลั�"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "�าม��อ���า�ู�����ยายาม��ิ���อ�วาม�ั����� 10 ��อ�วาม�ึ�����ร�อม�ั�"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:122
 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:109
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "�าม�มื�อ�ู�����ยายามส����อ�วาม��ย�ม�มี�ู�รั���ราย�าร \"�ึ�\" หรือ \"สำ��า�ึ�\" �ลย"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "�าม�มื�อ�ู�����ยายามส�� HTML ��ย�ี��ู�รั��ม���อ��าร"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "�าม�มื�อ�ู�����ำ��รื�อ�หมาย��อ�วามหลายราย�าร"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Put personalized signatures at the top of replies"
+msgstr "�ส�ลาย����ส�ว��ัว�ว���า����อ���อ�วาม�ี��อ�"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Put the cursor at the bottom of replies"
+msgstr "วา���อร���อร��ว��ี���าย��อ�วาม�ี��อ�"
+
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "�รว�รู�ห��า�ส��อารม������อ�วาม�ละ����ี���วยรู�ภา��ห�"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "�รว�รู�ลิ�������อ�วาม�ละ����ี��ห�"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "�รว��วาม�����ยะ����หมาย���า�ุ���ั�"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "���ร��อรีสำหรั��ั��ึ�"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "���หารู��อ��ู�ส���า�สมุ��ี�อยู�����รื�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "ส���มล��รู� HTML ��ย�ริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "ส���มล��รู� HTML ��ย�ริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "�ส���อลัม���ี�อยู�อี�มล�ู�ส����ราย�าร��อ�วาม��วย"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "��ว��วลา�าร�รั���อมูล�ั���ิร���วอร�"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:137
+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
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "�ส����อ� \"สำ��าลั��ึ�\" �มื�อส���มล"
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "�ส����อ� \"สำ��า�ึ�\" �มื�อส���มล"
+
+#: ../mail/evolution-mail.schemas.in.h:140
+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 "�ส����อ� \"�ี�อยู��อ��ลั�\" �มื�อ��ะ�ระ�าศ���ลุ�ม��าว"
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "�ส����อ� \"�ี�อยู��อ��ลั�\" �มื�อส���มล"
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "�ส��ภา���ลื�อ��หว"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Show all message headers"
+msgstr "�ส��ส�ว�หัว�ั��หม��อ���อ�วาม"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Show all the headers when viewing a messages."
+msgstr "�ส����อมูลส�ว�หัว�ั��หม��มื�อ�ส����อ�วาม"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "�ส��ภา��ี�มี�าร��ลื�อ��หว��ย��ลื�อ��หวภา�"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "�ส����อ�วาม�ี�ล��ล�ว��ราย�าร��อ�วาม��วย ��ย�ส������ี���า"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "�ส����อ�วาม�ี�ล��ล�ว��ราย�าร��อ�วาม��วย"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Show image animations"
+msgstr "�ส��ภา���ลื�อ��หว"
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr "�ส����อมูลส�ว�หัว \"วั��ี\" �าม�����ั�"
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "�ส��รู��อ��ู�ส��"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid ""
+"Show the \"Bcc\" 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:154
+msgid ""
+"Show the \"Cc\" 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:155
+msgid ""
+"Show the \"From\" 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: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
+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
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "�ส���อลัม���ี�อยู�อี�มล�ู�ส����ราย�าร��อ�วาม��วย"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:160
+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 "
+"format and local time zone."
+msgstr ""
+"�ส����อมูลส�ว�หัว \"วั��ี\" �าม�����ั� (��ย����วลา��อ��ิ���มื�อ����วลา��า��ั����า�ั��) มิ�ะ�ั�� "
+"���ะ�ส����อมูลส�ว�หัว \"วั��ี�\" ��วยรู�����ี��ู�����ำห�� �ละ�������วลา��อ��ิ��"
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "�ส��รู��อ��ู�ส������อ�อ�า���อ�วาม��วย"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "�รว��ัวสะ����ะ�ิม��"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "สี�อ��าร�รว��ัวสะ��"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "ภาษา�ี��รว��ัวสะ��"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "�วามสู��ริยาย�อ�ห��า��า��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า��อ�รั���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "���อั�ษร��อร�มิ�ัล"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "��า�ส�ว��อ���อ�วามสู�สุ�"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "�ลั��อิ��ริยายสำหรั��าร�รว���อ�วาม�ยะ"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../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:139
+#: ../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:140
+#: ../mail/evolution-mail.schemas.in.h:172
+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 "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"รู�����าร�ั�ห��า�อ�ะ�ำห���ำ�ห����อ���อ��ส���ัวอย�า���ีย��ั�ราย�ื�อ��อ�วาม \"0\" "
+"(�����ั�) �ะวา���อ��ส���ัวอย�า��ว����ราย�ื�อ��อ�วาม \"1\" (�����ว�ั��) "
+"�ะวา���อ��ส���ัวอย�า��ว���า�ราย�ื�อ��อ�วาม"
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "���อั�ษร��อร�มิ�ัลสำหรั��ส����อ�วาม�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "���อั�ษร�วาม�ว�า��ม����ี�สำหรั��ส����อ�วาม�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13773,7 +11826,7 @@ msgstr ""
 "��า�ี����������มีสาม��า �ือ \"0\" สำหรั���อ�ิ��ลา�, \"1\" สำหรั��ำ��ือ� �ละ \"2\" "
 "สำหรั���อ�วาม�ี�ั��"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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."
@@ -13781,7 +11834,7 @@ msgstr ""
 "��า�ี��ำห����า�สู�สุ��อ�ส�ว��อ���อ�วาม�ี��ะสามาร��ั�รู������ Evolution ��� ��า�ริยาย�ือ 4 "
 "MB หรือ 4096 KB �ละ�ำห����า��ห��วย KB"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:177
 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 "
@@ -13790,7 +11843,7 @@ msgstr ""
 "�ม��ะ��ิ�����ลั��อิ��รว���อ�วาม�ยะ�ว�หลาย�ัว �ี������ลั��อิ��ริยาย ��า�ลั��อิ��ริยาย�ู��ิ� "
 "���ะ�ม��ยายาม�อย������ลั��อิ�อื�����"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:178
 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."
@@ -13798,7 +11851,7 @@ msgstr ""
 "��า�ี��ะ�ู�อ�า���ีย��รั����ียว �ล�วล�า���า���� \"false\" �ั��ีหลั��า�อ�า� ห��า�ี��อ��ีย��ี� "
 "�ือย��ลิ��าร�ลือ��มล��ราย�าร �ละย��ลิ��าร�ส���ัวอย�า�อี�มลสำหรั���ล��อร��ั���"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:179
 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;"
@@ -13809,7 +11862,7 @@ msgstr ""
 "�ร�อม�ำห����วยว�า�ะ�ส��หรือ�ม� รู�����อ���ร�สร�า� XML �ือ &lt;header enabled&gt; "
 "��ย�ำห�� enabled ��า��อ��าร�ห��ส�� header ��มุมมอ��มล"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:180
 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 "
@@ -13817,13 +11870,13 @@ msgid ""
 msgstr ""
 "�ัว�ลือ��ี���ี�ยว��อ��ั��ีย� lookup_addressbook "
 "�ละ����ำห��ว�า�ะ��ิ�หา�ี�อยู���สมุ��ี�อยู�����รื�อ����า�ั��หรือ�ม� "
-"��ื�อ��าม�าร�รว��ยะ���มล�ี�ส��มา�า��ี�อยู��ิ���อ�ี�รู��ั�"
+"��ื�อ��าม�าร�รว��ยะ���มล�ี�ส��มา�า��ู��ิ���อ�ี�รู��ั�"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "�ัว�ลือ��ี��ะ��วย��ิ�ม�วาม�ร�ว���าร�ึ���อมูล"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13831,13 +11884,13 @@ msgstr ""
 "�ำห���ำ�ว�ราย�าร�ี�อยู��ี��ะ�ส����มุมมอ�ราย�าร��อ�วาม�ริยาย �ึ��ราย�าร�ี���ิ��ั�� �ะ�ู������วย "
 "'...'"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:183
 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:151
+#: ../mail/evolution-mail.schemas.in.h:184
 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 "
@@ -13846,115 +11899,81 @@ msgstr ""
 "��า�ี��ำห��ว�า�ะ�รีย��ระ�ู��ามลำ�ั���อ�หลั������ละสาย ����าร�รีย��ามวั��ี� ��อ���ิ� Evolution "
 "�หม��ึ��ะมี�ล"
 
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Thread the message list."
-msgstr "�รีย��ระ�ู���ราย�าร��อ�วาม"
-
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Thread the message-list"
-msgstr "�รีย��ระ�ู���ราย�าร��อ�วาม"
-
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "�รีย��ระ�ู���ราย�าร��อ�วาม�ามหัว�รื�อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "�ำห���วลา�ี��ะ�ำ��รื�อ�หมาย��อ�วามว�าอ�า��ล�ว"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "�ำห���วลา�ี��ะ�ำ��รื�อ�หมาย��อ�วามว�าอ�า��ล�ว"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "ส�ริ� UID �อ��ั��ี�ริยาย"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "สี�อ��ส������ี��ี������ำสะ���ิ��มื�อ����าร�รว��ัวสะ����ะ�ิม��"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "����ีมอ��ละ��ล�อ����อ� SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "����ีมอ��ละ��ล�อ����อ� SpamAssassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "������อั�ษร�ำห���อ�"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "������อั�ษร�ำห���อ�สำหรั��ส���ล�มล"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "��สอ�ส��ม����ม������รือ��าย���า�ั��"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "��สอ�ส��ม����ม������รือ��าย���า�ั�� (�ม���� DNS)"
 
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Use side-by-side or wide layout"
-msgstr "�รีย���อ�ห��า��า����วา���า��ั�����ว�อ�"
+#: ../mail/evolution-mail.schemas.in.h:196
+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 "
+"message or the bottom."
+msgstr ""
+"�ู����สามาร��ว��ุม���ว�า�ะ�ห�วา���อร���อร��ี��ห��มื�อ�ะ�อ���อ�วาม "
+"��ยระ�ุว�า�ะ�ห�วา���อร���อร��ว��ี��ห�ือหรือ�����อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:197
+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 "
+"the message or the bottom."
+msgstr ""
+"�ู����สามาร��ว��ุม���ว�า�ะ�ห��ส�ลาย�����ี��ห��มื�อ�ะ�อ���อ�วาม "
+"��ยระ�ุว�า�ะ�ห��ส�ลาย�����ว��ี��ห�ือหรือ�����อ�วาม"
+
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "���อั�ษร�วาม�ว�า��ม����ี�"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "�ม�ู มุมมอ�/สำ��าลั� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "�ม�ู มุมมอ�/สำ��าลั� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "�ม�ู มุมมอ�/สำ��า�ึ� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "�ม�ู มุมมอ�/สำ��า�ึ� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "�ม�ู มุมมอ�/�า� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "�ม�ู มุมมอ�/�า� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "�ม�ู มุมมอ�/�ระ�าศ�ี� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "�ม�ู มุมมอ�/�ระ�าศ�ี� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "�ม�ู มุมมอ�/�ี�อยู��อ��ลั� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "�ม�ู มุมมอ�/�ี�อยู��อ��ลั� �าอยู�"
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "�ำห��ว�า�ะ��ิม�ารร�อ��อ�ห������ารรั��มล���ุ���อ�วาม�ี�ส����ย�ริยายหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "�ำห��ว�า�ะ�ิ��ารละ�ื�อ��ล��อร���วย�ุ�����ลา�������า�หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13962,22 +11981,28 @@ msgstr ""
 "�ำห��ว�า�ะ�อย�ลั�������าร�รีย��ระ�ู���อ�วาม��ยอาศัยหัว�รื�อ��มื�อ��อ�วาม�ม�มี��อมูลส�ว�หัว In-"
 "Reply-To หรือ Reference หรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "�ำห��ว�า�ะ�รีย��ระ�ู��ามลำ�ั���อ�หลั������ละสายหรือ�ม�"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "�วาม�ว�า��อ���อ�ราย�าร��อ�วาม"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "�วาม�ว�า��อ���อ�ราย�าร��อ�วาม"
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "�ำลั��ำ���า��อมูล Elm"
 
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "�มล"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "��รื�อ�มือ�ำ���า��อมูล Elm �อ� Evolution"
@@ -13986,54 +12011,65 @@ msgstr "��รื�อ�มือ�ำ���า��อมูล Elm 
 msgid "Import mail from Elm."
 msgstr "�ำ���า�มล�า� Elm"
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "��ล��อร��ลาย�า�:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "�ลือ���ล��อร�"
+
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "�ลือ���ล��อร��ี��ะ�ห��ำ���า"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:245
 msgid "Berkeley Mailbox (mbox)"
 msgstr "�ล�อ��มล�อ���ิร��ลีย� (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "��รื�อ�มือ�ำ���า��ล��อร���รู���� mailbox �อ� Berkeley"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "�ำลั��ำ���า�ล�อ���หมาย"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "�ำลั��ำ���า `%s'"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "�ำลั��รว�สอ� %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "�ำลั��ำ���า��อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "สมุ��ี�อยู�"
+
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "��รื�อ�มือ�ำ���า��อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "�ำ���า�มล�า� Pine"
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "�มล��ยั� %s"
@@ -14053,639 +12089,436 @@ msgstr "�รื�อ� %s"
 msgid "%s mailing list"
 msgstr "�มลลิ�ลิส�� %s"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "��ิ�ม���าร�รอ�"
 
-#: ../mail/mail-component.c:550
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "�ลือ�อยู� %d ราย�าร, "
-msgstr[1] "�ลือ�อยู� %d ราย�าร, "
-
-#: ../mail/mail-component.c:554
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "ล���อ�วาม�� %d ��ั�"
-msgstr[1] "ล���อ�วาม�� %d ��ั�"
-
-#: ../mail/mail-component.c:561
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "�มล�ยะ %d ��ั�"
-msgstr[1] "�มล�ยะ %d ��ั�"
-
-#: ../mail/mail-component.c:564
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "��หมายร�า� %d ��ั�"
-msgstr[1] "��หมายร�า� %d ��ั�"
-
-#: ../mail/mail-component.c:566
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "ส���ล�ว %d ��ั�"
-msgstr[1] "ส���ล�ว %d ��ั�"
-
-#: ../mail/mail-component.c:568
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "ยั��ม�ส�� %d ��ั�"
-msgstr[1] "ยั��ม�ส�� %d ��ั�"
-
-#: ../mail/mail-component.c:574
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "ยั��ม�อ�า� %d, "
-msgstr[1] "ยั��ม�อ�า� %d, "
-
-#: ../mail/mail-component.c:575
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "รวม %d"
-msgstr[1] "รวม %d"
-
-#: ../mail/mail-component.c:927
-msgid "New Mail Message"
-msgstr "��อ�วาม�มล�หม�"
-
-#: ../mail/mail-component.c:928
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "��อ�วาม�_มล"
-
-#: ../mail/mail-component.c:929
-msgid "Compose a new mail message"
-msgstr "��ีย��มล��ั��หม�"
-
-#: ../mail/mail-component.c:935
-msgid "New Mail Folder"
-msgstr "��ล��อร��มล�หม�"
-
-#: ../mail/mail-component.c:936
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "�_�ล��อร��มล"
-
-#: ../mail/mail-component.c:937
-msgid "Create a new mail folder"
-msgstr "สร�า���ล��อร��มล�หม�"
-
-#: ../mail/mail-component.c:1084
-msgid "Failed upgrading Mail settings or folders."
-msgstr "�รั�รุ����า�ั��หรือ��ล��อร��มล�ม�สำ�ร��"
-
-#: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr "_�รว�สอ�หา��ิ��ี�รอ�รั�"
-
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(หมาย�ห�ุ: ��อ��ริ�ม��ร��รม�หม��ึ��ะมี�ล)"
 
-#: ../mail/mail-config.glade.h:4
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>�ม�รอ�รั� SSL �� Evolution �ี��อม��ล�มา�ี�</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>รู��ู�ส��</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Sig_natures</b>"
-msgstr "<b>_ลาย����</b>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<p>�ัว�ลือ��าร�อ��ั�����มล</b> (�ม��อ��ะ�ำ)"
 
-#: ../mail/mail-config.glade.h:8
-msgid "<b>_Languages</b>"
-msgstr "<b>_ภาษา</b>"
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">��อมูล�ั��ี�ู����</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">�ารยื�ยั��ัว�ุ��ล</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">�ารร�า���อ�วาม</span>"
-
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">�าร�ำห����า</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">�ฤ�ิ�รรม���ิ</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">ล��มล</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">��อมูล_หัว��อ�วาม�ี��ส��</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">��าย</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">�าร�หล�รู�ภา�</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">�าร�ส����อ�วาม</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">�ัวอั�ษร��อ�วาม</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr "��อมูล�ั��ี"
 
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">�าร����รั���อ�วาม</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">��อมูล�สริม</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">�ัว�ลือ�</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">���อั�ษรสำหรั��ิม��</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">�าร�ั����า�ร�อ��ี</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">��อมูล�ำ����</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">MIME �ิรภัย (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">ระ���ิรภัย</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">��หมายออ��ละ��หมายร�า�</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">�าร�ำห����า��ิร���วอร�</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">��ิ��อ��าร_ยื�ยั��ัว�ุ��ล</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "�าร�ั��าร�ั��ี�ู����"
-
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "��ิ�มลาย�����_หม�..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "��ิ�ม_ส�ริ���"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:5
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "�����ำ�ั���อ�วามออ��_สมอ�มื�อ����ั��ี�ี�"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "���ารหัส�ึ����อ�_��วย�มื�อส����อ�วาม���ารหัส"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ส��_สำ��า (cc) �ุ��รั�� �ึ�:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ส��สำ��า_ลั� (bcc) �ุ��รั�� �ึ�:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "�_�ื�อ�ือ�ุ������ว��ุ����อ���า����า�สมอ�มื�อ�ะ���ารหัส"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "���ารหัส�ึ�_��า����า�สมอ�มื�อส����อ�วาม���ารหัส"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "ร�อ��อ�าร�_���รั���อ�วาม�สมอ"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "�ารยื�ยั��ัว�ุ��ล"
+
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "��ร�รู��ส��_อารม����ยอั���มั�ิ"
 
-#: ../mail/mail-config.glade.h:47
-msgid "Baltic (ISO-8859-13)"
-msgstr "�อล�ิ� (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:48
-msgid "Baltic (ISO-8859-4)"
-msgstr "�อล�ิ� (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "�ุ�_อั��ระ:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.ui.h:17
+msgid "Ch_eck for Supported Types"
 msgstr "_�รว�สอ���ิ��ี�รอ�รั�"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "�รว�_สอ��ยะ��วย��อมูลส�ว��ี�หัว�ำห���อ�"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "�รว�สอ���อ�วาม�า�_��าว�า�����มล�ยะหรือ�ม�"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "�รว��ัวสะ����ะ_�ิม��"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "�รว�สอ��มล�ี����ามา�����มล�ยะ"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "_ล�า�"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "ล�า_�"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "_สีสำหรั��ำ�ี�สะ���ิ�:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr "�าร��ีย���หมาย"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "��า�ั��"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "�าม��อ������วา_���ล��อร�"
 
-#: ../mail/mail-config.glade.h:59
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"�อ�ส���วามยิ��ี �าร�ำห����า�มล�อ��ุ��สร��สม�ูร���ล�ว\n"
-"\n"
-"��ะ�ี��ุ�สามาร�รั��ละส��อี�มล��วย Evolution ����ล�ว\n"
-"\n"
-"�� \"�ริ�ม���\" ��ื�อ�ั��ึ��าร�ั����า�อ��ุ�"
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "�ฤ�ิ�รรม���ิ"
 
-#: ../mail/mail-config.glade.h:65
-msgid "De_fault"
-msgstr "_�ริยาย"
-
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "ร_หัสอั��ระ�ริยาย:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr "ล��มล"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "ล���อ�วาม�ยะ��อ�_ออ�"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "�_���ลาย�����ิ�ิ�ัล�ำ�ั���อ�วามออ� (��ย�ริยาย)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.ui.h:36
+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.glade.h:72
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�_ม���อ��ำ��รื�อ�หมาย��อ�วามว�า�����ยะ��า�ู�ส��อยู���สมุ��ี�อยู�"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.ui.h:39
 msgid "Do not quote"
 msgstr "�ม�อ�า��ำ�ู�"
 
-#: ../mail/mail-config.glade.h:74
-msgid "Done"
-msgstr "�สร���ล�ว"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "�_�ล��อร���หมายร�า�:"
 
-#: ../mail/mail-config.glade.h:76
-msgid "Email Accounts"
-msgstr "�ั��ีอี�มล"
-
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "�ี�อยู�อี�_มล:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "��_�ั��ยะ��อ�ออ�"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "��ิ������ร��_ว��วรร������ุ�ม�ำ�า�ลั�"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "��ิ������ล��อร�_���หา"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "��รั�รอ��าร���าร_หัสลั�:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "�_��ารหัสลั���อ�วามออ� (��ย�ริยาย)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "�วาม�ว�า�_���ี�:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "���อั�ษร�วาม�ว�า�_���ี�:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "�ุ�สม�ั�ิ���อั�ษร"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "�ั�รู������อ�วาม���� _HTML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "�ื�อ�_��ม:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "��อ�วาม HTML"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "_�ร�อ��ี HTTP:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "ส�ว�หัว"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "�����ารอ�า�_�ำ�ู���วยสี"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:59
 msgid "Inline"
 msgstr "����อ�วาม"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:60
 msgid "Inline (Outlook style)"
 msgstr "���รร�ั� (��� Outlook)"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "��าย"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "�ารา�ภาษา"
 
-#: ../mail/mail-config.glade.h:102
-msgid "Mail Configuration"
-msgstr "�าร�ำห����า�มล"
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "�าร�หล�ภา�"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "�ารา���อมูลส�ว�หัว�อ��มล"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "�ำ�ห����ล�อ��มล"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Message Composer"
-msgstr "�าร��ีย���อ�วาม"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "�าร�ส����อ�วาม"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "���อั�ษร�อ���อ�วาม"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "�าร����รั���อ�วาม"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "�_ม�����ร�อ��ีสำหรั�:"
 
-#: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "หมาย�ห�ุ: ��รื�อ�หมาย�ี�ล�า����ื�อ��าย�ะ�ู���������ีย���ว����ม�ู"
-
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:73
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "หมาย�ห�ุ: �ุ��ะ�ม��ู��ามรหัส��า����ว�า�ะ��ื�อม��อ�����รั���ร�"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "�ัว�ลือ��ี��ะ�ม�มี�ล��า�รว�����อมูลส�ว�หัว�ี��ำห���ว��ห�����ี��วาม�����ยะ"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "��อมูล�สริม"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "_อ����ร:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "�ื�อ_�ุ��� PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "_รหัส��า�:"
 
-#: ../mail/mail-config.glade.h:115
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"�รุ�า��อ��ื�อ�ี��รรยาย�ั��ี�ี�����อ�ว�า���า�ล�า�\n"
-"�ื�อ�ี��ะ�����ื�อ�าร�ส���ล���า�ั��"
-
-#: ../mail/mail-config.glade.h:117
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"�รุ�า��อ���อมูล��ี�ยว�ั�วิ�ี�ารส���มล�อ��ุ� ��า�ม�มั�����ห�ลอ��าม�ู��ู�ลระ�� "
-"หรือ�ู��ห��ริ�ารอิ���อร������อ��ุ�"
-
-#: ../mail/mail-config.glade.h:118
-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 "
-"information in email you send."
-msgstr ""
-"�รุ�า��อ���อมูล�ื�อ�ละ�ี�อยู�อี�มล�อ��ุ���า�ล�า��ี� ส�ว�����อ� \"��อมูล�สริม\" �ั�� "
-"�ุ��ม��ำ������อ���ิม��อมูล �ว���สีย���ว�า�ุ�อยา��ะ�ห���อมูล�ั���รา��อยู���อี�มล�ี��ุ�ส��"
-
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "�รุ�า�ลือ��ัว�ลือ����ลุ�ม��า�ล�า��ี�"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "�อร��:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "�าม��อ�ส����อ�วาม�ี�มี����ู�รั�สำ��า_ลั�ล�ว��"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.ui.h:83
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Printed Fonts"
+msgstr "���อั�ษรสำหรั��าร�ั��ิม��"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Proxy Settings"
+msgstr "��า�ั���ร�อ��ี"
+
+#: ../mail/mail-config.ui.h:87
 msgid "Quoted"
 msgstr "อ�า��ำ�ู�"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "_�ำรหัส��า�"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "_�ี�อยู��อ��ลั�:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "�ำ_รหัส��า�"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "�ฮส�� S_OCKS:"
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "��อมูล�ำ����"
+
+#: ../mail/mail-config.ui.h:94
+msgid "SSL is not supported in this build of Evolution"
+msgstr "�ม�รอ�รั� SSL �� Evolution �ี��อม��ล�มา�ี�"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "���_หารู��อ��ู�ส���า�สมุ��ี�อยู�����รื�อ�"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "�_ลือ�..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "_ส���าร����รั���อ�วาม:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "���อั�ษร_มา�ร�า�:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr "Secure MIME (S/MIME)"
+
+#: ../mail/mail-config.ui.h:101
 msgid "Select Drafts Folder"
 msgstr "�ลือ���ล��อร�������อ�วาม��ั�ร�า�"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "�ลือ����อั�ษร�วาม�ว�า����ี�สำหรั� HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "�ลือ����อั�ษร�วาม�ว�า����ี�สำหรั��ิม�� HTML"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "�ลือ����อั�ษร�วาม�ว�า��ม����ี�สำหรั� HTML"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "�ลือ����อั�ษร�วาม�ว�า��ม����ี�สำหรั��ิม�� HTML"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.ui.h:106
 msgid "Select Sent Folder"
 msgstr "�ลือ���ล��อร�������อ�วามออ�"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:107
+msgid "Sender Photograph"
+msgstr "รู��ู�ส��"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "�ารส���มล"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "�_�ล��อร���อ�วามออ�:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:110
+msgid "Sent and Draft Messages"
+msgstr "��อ�วาม�ี�ส���ละ��ั�ร�า�"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "��ิร���วอร���อ��าร�าร_ยื�ยั��ัว�ุ��ล"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr "��า�ั����ิร���วอร�"
+
+#: ../mail/mail-config.ui.h:113
+msgid "Server _Type:"
 msgstr "_��ิ���ิร���วอร�:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr "_ลาย����"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "��_รั�รอ�ลาย����:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "_ลาย����:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "ลาย����"
 
-#: ../mail/mail-config.glade.h:147
-msgid "Signatures Table"
-msgstr "�ารา�ลาย����"
-
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "�าร�รว��ัวสะ��"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "�ริ�ม�ิม���อ��ี�_��าย��อ�วาม"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.ui.h:121
+msgid "T_ype:"
 msgstr "_��ิ�:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ราย�ื�อภาษา���ี��ี� �ะมี���าะภาษา�ี��ุ��ิ��ั�����า�ุ�รม�ว����า�ั��"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14694,7 +12527,7 @@ msgstr ""
 "�ลลั����อ�ส�ริ����ี��ะ�ู��������ลาย�����อ��ุ�\n"
 "�ื�อ�ี��ุ��ำห�� �ะ�����ื�อ�ส���มื�ออ�า�อิ��ึ����า�ั��"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14702,233 +12535,248 @@ msgstr ""
 "�รุ�า��อ��ื�อ�ี��ุ���อ��าร����รีย��ั��ี�ี�\n"
 "�ัวอย�า�����: \"�า�\" หรือ \"ส�ว��ุ��ล\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "_�ื�อ�ู����:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "����ารยื�ยั�_�ัว�ุ��ล"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../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
 msgid "User_name:"
 msgstr "_�ื�อ�ู����:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "�วาม�ว�า��_ม����ี�:"
 
-#: ../mail/mail-config.glade.h:161
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
-"ยิ��ี��อ�รั�สู���รื�อ�มือ��วย�ำห����า�มล Evolution\n"
-"\n"
-"�ลิ� \"�ั���\" ��ื�อ�ริ�ม "
-
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "�_�ิ�มลาย����"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "�หล�รู�ภา��า�อิ���อร������_สมอ"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "URL สำหรั��ั����า�ร�อ��ี_อั���มั�ิ:"
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "��ิ��อ��าร_ยื�ยั��ัว�ุ��ล"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "_�ลั��อิ��รว��ยะ�ริยาย:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "��ื�อม��ออิ���อร�������ย_�ร�"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "�_ม���อ������ำ�ั��ารร�อ��อ��ี�ยว�ั��าร�ระ�ุม (��ื�อ�วาม���า�ั�����ั� Outlook)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "รู�����ารส���มล_��อ:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "�ห�_ลาย����อยู��ห�ือ��อ�วาม��ิม���าร�อ�"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "_ภาษา"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "�_หล�รู�ภา����าะ����อ�วาม�ี�มา�า��ู��ิ���อ"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "_��ิ�หา�ี�อยู��า�สมุ��ี�อยู�����รื�อ����า�ั��"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "_�ำห���ห������ั��ีหลั�"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "��า�ร�อ��ี_�ำห���อ�:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "�ำ��รื�อ�หมาย��อ�วามว�า_อ�า��ล�วหลั��า�"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "�_ม��หล�รู�ภา��า�อิ���อร�����"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "_�า�:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_�าม��อ�ส����อ�วาม HTML ��ยั��ู��ี��ม���อ��าร"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�าม��อ�ส����อ�วาม�ี��ม�มี_หัว��อ�รื�อ�"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "รู�����าร�อ_�:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_ส�ริ���:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "�ร�อ��ี HTTP _�ิรภัย:"
 
-#: ../mail/mail-config.glade.h:186
-msgid "_Select..."
-msgstr "�_ลือ�..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../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.glade.h:189
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "�_ส��ภา���ลื�อ��หว"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�_ส��รู��อ��ู�ส������อ��ส���ัวอย�า���อ�วาม��วย"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_�ำ�ั��ี�อยู�ส�ว�หัว �ึ� / สำ��า�ึ� / สำ��าลั��ึ� �ม���ิ�"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "�_���าร��ื�อม��อ����ิรภัย:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "�����า_�ริยาย�อ�ระ��"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "�_�����อั�ษร�หมือ���ร��รมอื���"
 
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr "a"
+
 # in "_Shrink To / Cc / Bcc headers to ... addresses"
 # -> "_�ำ�ั��ี�อยู�ส�ว�หัว �ึ� / สำ��า�ึ� / สำ��าลั��ึ� �ม���ิ� ... ราย�าร"
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "ราย�าร"
 
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "b"
+
 # in "Highlight _quotations with ... color"
 # -> "�����ารอ�า�_�ำ�ู���วยสี ... "
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "�ำอ�ิ�าย"
 
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>�หล��สำหรั���ล��อร����หา</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">ลาย�����ิ�ิ�ัล</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">�าร���ารหัส</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "��ล��อร�ระยะ��ล�ี�����า�อยู��ั��หม�"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "��ล��อร�����รื�อ��ละ��ล��อร�ระยะ��ล�ี����อยู��ั��หม�"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "��ล��อร�����รื�อ��ั��หม�"
 
-#: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "�ัว�ิม���ห��-�_ล���ร��ั�"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "�รีย�"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "�_สร���ล�ว"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "_หา:"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "ลาย�����ิ�ิ�ัล"
 
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "หา����อ�วาม"
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "�ม���อ�ส����อ"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
-msgid "Flag to Follow Up"
-msgstr "�ั�����ื�อ�าม�ระ�ู�"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "�าร���ารหัสลั�"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "�าร�อ�รั���อมูล�อ���ล��อร�"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "��ะ�ระ�าศ�อ�"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "������ื�อ�รา�"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "ส����อ"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "��อ��ล�สั��าอ�ุ�า�"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "�ม�����ลือ�"
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "�ม��ำ������อ��อ�"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "�อ��ึ��ุ���"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "�รว��า�"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
-msgstr "�_�ิร���วอร�:"
+msgstr "��ิร�_��วอร�:"
+
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Search Folder Sources"
+msgstr "�หล��สำหรั���ล��อร����หา"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "��อมูลระ��รั�ษา�วาม�ลอ�ภัย"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "��าะ����ล��อร�"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14936,42 +12784,42 @@ msgstr ""
 "��อ�วาม��อ���ี� �ือ��อ�วาม�ี��ุ��ลือ��ว���ื�อ�ิ��าม�ระ�ู�\n"
 "�รุ�า�ลือ���ิ�ั�ิ�าร�ิ��าม�ระ�ู��า��ม�ู \"��\""
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "_ยอมรั�สั��าอ�ุ�า�"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "�ระ�ำ_ภาย��:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
-msgstr "_��:"
+msgstr "�_�:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "_�า�ี��ี���ื�อยอมรั���อ��ล���สั��าอ�ุ�า�"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:893
 #, c-format
 msgid "Pinging %s"
 msgstr "�ำลั� ping %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "�ำลั��รอ���อ�วาม�ี��ลือ�"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "�ำลั��ึ��มล"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "�ม�สามาร�����ัว�รอ��รอ��มลออ����: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14980,123 +12828,126 @@ msgstr ""
 "�ม�สามาร���ิ�ม��อมูล��อ��าย %s ���: %s\n"
 "�ะ��ิ�ม��อ��าย��ล��อร� `ส���ล�ว' ����รื�อ����"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "�ม�สามาร���ิ�ม��อมูล��อ��าย��ล��อร� `ส���ล�ว' ����รื�อ����: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "�ำลั�ส����อ�วาม"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�ำลั�ส�� %d ��อ�วาม �า� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "�ม�สามาร�ส�� %d ��อ�วาม �า� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "ย��ลิ�"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "�สร���ล�ว"
 
-#: ../mail/mail-ops.c:872
-msgid "Saving message to folder"
-msgstr "�ำลั��ั��ึ���อ�วาม��ยั���ล��อร�"
+#: ../mail/mail-ops.c:905
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "�ำลั��ั��ึ���อ�วามล�����ล��อร� '%s'"
+
+#: ../mail/mail-ops.c:982
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "�ำลั�ย�าย��อ�วาม��ยั� '%s'"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Moving messages to %s"
-msgstr "�ำลั�ย�าย��อ�วาม��ยั� %s"
+msgid "Copying messages to '%s'"
+msgstr "�ำลั��ั�ลอ���อ�วาม��ยั� '%s'"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:1091
 #, c-format
-msgid "Copying messages to %s"
-msgstr "�ำลั��ั�ลอ���อ�วาม��ยั� %s"
+msgid "Scanning folders in '%s'"
+msgstr "�ำลั��รว���ล��อร���า�� �� '%s'"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "��อ�วามส����อ"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1240
 #, c-format
-msgid "Opening folder %s"
-msgstr "�ำลั���ิ���ล��อร� %s"
+msgid "Opening folder '%s'"
+msgstr "�ำลั���ิ���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1306
 #, c-format
-msgid "Retrieving quota information for folder %s"
-msgstr "�ำลั��ึ���อมูล��ว��าสำหรั���ล��อร� %s"
+msgid "Retrieving quota information for folder '%s'"
+msgstr "�ำลั��ึ���อมูล��ว��าสำหรั���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1378
 #, c-format
-msgid "Opening store %s"
-msgstr "�ำลั���ิ��หล������ %s"
+msgid "Opening store '%s'"
+msgstr "�ำลั���ิ��หล������ '%s'"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1449
 #, c-format
-msgid "Removing folder %s"
-msgstr "�ำลั�ล���ล��อร� %s"
+msgid "Removing folder '%s'"
+msgstr "�ำลั�ล���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ำลั�������อมูล�อ���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "�ำลั������วา��ละ������อมูล�อ��ั��ี '%s'"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "�ำลั�������อมูล�อ��ั��ี '%s'"
 
-#: ../mail/mail-ops.c:1649
-msgid "Refreshing folder"
-msgstr "�ำลั��หล���ล��อร��หม�"
+#: ../mail/mail-ops.c:1685
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "�ำลั��หล���ล��อร� '%s' �หม�"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
-msgid "Expunging folder"
-msgstr "�ำลั������วา���ล��อร�"
+#: ../mail/mail-ops.c:1725
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "�ำลั������วา���ล��อร� '%s'"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "�ำลั����ยะ�� '%s' �ิ��"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
 msgstr "��ล��อร�����รื�อ�"
 
-#: ../mail/mail-ops.c:1818
-#, c-format
-msgid "Retrieving message %s"
-msgstr "�ำลั��ึ���อ�วาม %s"
-
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "�ำลั��ึ� %d ��อ�วาม"
 msgstr[1] "�ำลั��ึ� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�ำลั��ั��ึ� %d ��อ�วาม"
 msgstr[1] "�ำลั��ั��ึ� %d ��อ�วาม"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15105,11 +12956,11 @@ msgstr ""
 "��ิ���อ�ิ��ลา���ะ�ั��ึ���อ�วาม��ยั�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "�ำลั��ั��ึ����ม���"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15118,134 +12969,130 @@ msgstr ""
 "�ม�สามาร�สร�า����ม�ลลั���: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ม�สามาร���ีย���อมูล: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "�ำลั��ั��าร��ื�อม��อ�า� %s"
+msgid "Disconnecting from '%s'"
+msgstr "�ำลั��ั��าร��ื�อม��อ�า� '%s'"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "�ำลั���ื�อม��อ�หม���ยั� %s"
+msgid "Reconnecting to '%s'"
+msgstr "�ำลั���ื�อม��อ�หม���ยั� '%s'"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "�ำลั���รียมออ��ล���ั��ี '%s'"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
 msgstr "�ำลั��รว�สอ��ริ�าร"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "�ำลั�ย��ลิ�..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "รั� & ส���มล"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "ย��_ลิ��ั��หม�"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "�ำลั��รั���อมูล..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "�ำลั�รอ..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "�ำลั��รว�สอ��มล�หม�"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "��อ�วลีรหัส��า�สำหรั� %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "��อ�วลีรหัส��า�"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "��อ�รหัส��า�สำหรั� %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "��อ�รหัส��า�"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "�ู����ย��ลิ���ิ�ั�ิ�าร"
 
-#: ../mail/mail-signature-editor.c:201
-msgid "_Save and Close"
-msgstr "_�ั��ึ��ละ�ิ�"
-
-#: ../mail/mail-signature-editor.c:355
-msgid "Edit Signature"
-msgstr "�����ลาย����"
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "�ม�มี�ี�อยู��ลาย�า� ย��ลิ��ารส����อ��อ�วาม"
 
-#: ../mail/mail-signature-editor.c:370
-msgid "_Signature Name:"
-msgstr "_�ื�อลาย����:"
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "�ม�มี�ั��ี�ี��ะ��� ย��ลิ��ารส����อ��อ�วาม"
 
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "�ม�สามาร�สร�า����ร��อรี�ี������ั� `%s': %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "�ำลั��ยายาม��� movemail �ั��หล�� `%s' �ึ���ม���� mbox"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��อ�วามส����อ - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "��อ�วามส����อ"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "��ล��อร�����ม����: `%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "�ำลั��ั����า��ล��อร����หา: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "�ำลั��รั���อมูล��ล��อร����หาสำหรั� '%s:%s'"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "�ำลั��รั���อมูล��ล��อร����หาสำหรั� '%s'"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "�������ล��อร����หา"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "สร�า���ล��อร����หา�หม�"
 
@@ -15320,74 +13167,82 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��รู���� HTML?"
 
 #: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��วย�ี�อยู��ี�����าร�ม����?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��วย�ี�อยู��ี�����าร�ม����?"
+
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม�ี�มี����ู�รั�สำ��าลั�ล�ว��?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "�ุ������หรือ�ม� ว�า��อ��ารส����อ�วาม��ย�ม�มี�ื�อ�รื�อ�?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "��ราะ \"{0}\""
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "��ราะ \"{2}\""
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "ลาย������ล�า"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "�ม�สามาร���ิ�ม��ล��อร����หา \"{0}\""
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "�ม�สามาร��ั�ลอ���ล��อร� \"{0}\" ��ยั� \"{1}\""
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "�ม�สามาร�สร�า���ล��อร� \"{0}\""
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "�ม�สามาร�สร�า����ร��อรี�ั��ึ��ั�ว�ราว"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "�ม�สามาร�สร�า����ร��อรี�ั��ึ� ��ื�อ��า� \"{0}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "�ม�สามาร�ล���ล��อร� \"{0}\""
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "�ม�สามาร�ล���ล��อร�ระ�� \"{0}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "�ม�สามาร��������ล��อร����หา \"{0}\" ��ราะ�ม�มี��ล��อร��ี�ว�า"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "�ม�สามาร�ย�าย��ล��อร� \"{0}\" ��ยั� \"{1}\""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "�ม�สามาร���ิ��หล�� \"{1}\""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "�ม�สามาร���ิ��หล�� \"{2}\""
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "�ม�สามาร���ิ��หล���ลาย�า� \"{2}\""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 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."
@@ -15395,35 +13250,35 @@ msgstr ""
 "�ม�สามาร�อ�า����มสั��าอ�ุ�า� \"{0}\" ��ื�อ��า��ั�หา��ี�ยว�ั��าร�ิ��ั�� "
 "�ุ��ะ�ม�สามาร���������อ����ี���� ���ว�า�ุ��ะยอมรั���ื�อ���สั��าอ�ุ�า��ี�"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "�ม�สามาร���ลี�ย��ื�อ \"{0}\" ���� \"{1}\""
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "�ม�สามาร���ลี�ย��ื�อหรือย�าย��ล��อร�ระ�� \"{0}\" ���"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "�ม�สามาร��ั��ึ��วาม��ลี�ย���ล����ั��ี"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "�ม�สามาร��ั��ึ������ร��อรี \"{0}\""
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "�ม�สามาร��ั��ึ�ล����ม \"{0}\""
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "�ม�สามาร��ำห��ส�ริ���ลาย���� \"{0}\""
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "�รว��มล�ยะ�ม�สำ�ร��"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -15432,43 +13287,27 @@ msgstr ""
 "อย�าลืมว�ารหัส��า�ส�ว��ห���ย��วาม�����า�ระหว�า��ัว�ิม���ห��-�ล�� "
 "�า��ี�ุ�มล�อ���ร��อ��ุ�อา��ะ�ู�����า�อยู�"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "�ม�สามาร��ั��ึ����มลาย�������"
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "ล� \"{0}\" หรือ�ม�?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "ล��ั��ีหรือ�ม�?"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "ล���อ�วาม����ล��อร����หา \"{0}\" หรือ�ม�?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "ล���อ�วาม����ล��อร����หาหรือ�ม�?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "ละ�ลย�าร��ลี�ย���ล�หรือ�ม�?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "�_ม�ล�"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "�ม�ล�"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "�ม��ิ�����า�"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -15476,53 +13315,58 @@ msgstr ""
 "�ุ���อ��าร�รั���อมูล��ล��อร���า�� ภาย����รื�อ� "
 "�ี�มี�าร�ำ��รื�อ�หมายสำหรั��าร����า����ออ��ล��หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "�ุ���อ��าร�ำ��รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�วหรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "�ุ���อ��าร�ั��ึ��าร��ลี�ย���ล��อ��ุ�หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "��อ�รหัส��า�"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "��ิ���อ�ิ��ลา�ระหว�า�อ�า���อ�ำห���ัว�รอ�"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "��ิ���อ�ิ��ลา�ระหว�า��ระ�ำ��ิ�ั�ิ�าร"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "��ิ���อ�ิ��ลา���ะ{0}"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "���มมีอยู�����ม�สามาร���ีย��ั����"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "���มมีอยู�����ม�������ม���ิ"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "��า�ำ��ิ��าร��อ�� �ุ��ะ�ม�สามาร��รีย���อ�วาม�หล�า�ี��ื�มา���อี�"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "��า�ุ�ล���ล��อร� ��ื�อหา�ั��หม�����ล��อร��ละ��ล��อร�ย�อย�ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr "��า�ุ�ล���ล��อร� ��ื�อหา�ั��หม�����ล��อร��ะ�ู�ล��ิ��อย�า��าวร"
+
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "��า�ุ��ำ��ิ��าร��อ�� ��อมูล�ั��ี�ัว����ั��หม��ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -15530,29 +13374,33 @@ msgstr ""
 "��า�ุ��ำ��ิ��าร��อ�� ��อมูล�ั��ี�ู�����ละ�ัว����ั��หม�\n"
 "�ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "��า�ุ��ำ��ิ��าร��อ�� ��อมูล�ั��ี�ู�����ะ�ู�ล��ิ��อย�า��าวร"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "��า�ุ�หยุ� ��อ�วาม�หล�า�ี��ะ�ม��ู�ส���� ���ว�า Evolution �ะ�ริ�ม�ำ�า��หม�อี�"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Ignore"
 msgstr "�ม�ส���"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Invalid authentication"
 msgstr "�ารยื�ยั��ัว�ุ��ล�ม��ู���อ�"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
+msgid "Mail Deletion Failed"
+msgstr "ล��มล�ม�สำ�ร��"
+
+#: ../mail/mail.error.xml.h:70
 msgid "Mail filters automatically updated."
 msgstr "�รั���อมูล�ัว�รอ��มล��ยอั���มั�ิ�ล�ว"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 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 "
@@ -15563,31 +13411,27 @@ msgstr ""
 "�ึ����อมูล�ี��ะ�ส���ู�รั��ั��หม��อ���อ�วามอยู��ี �ุ�สามาร��ลี�ย��าร�ส����อมูล�ั��ล�าว��� "
 "��ย��ิ�ม�ู�รั�����อ� �ึ�: หรือ สำ��า: อย�า���อยห�ึ����"
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "�ำ��รื�อ�หมายว�า�ุ���อ�วามอ�า��ล�ว"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Missing folder."
 msgstr "��ล��อร��า�หาย��"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "No sources selected."
 msgstr "�ม�����ลือ��หล���ว�"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Opening too many messages at once may take a long time."
 msgstr "�าร��ิ���อ�วามมา���ิ��������ละ�รั��อา��ะ��อ��ิ��วลา�า�"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Please check your account settings and try again."
 msgstr "�รุ�า�รว�สอ��าร�ั����า�ั��ี�อ��ุ��ละลอ��หม�อี��รั��"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Please enable the account or send using another account."
 msgstr "�รุ�า��ิ�����ั��ี หรือ�ม���ส����วย�ั��ีอื��"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 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."
@@ -15595,7 +13439,7 @@ msgstr ""
 "�รุ�า��อ��ี�อยู�อี�มล�ี��ะส������อ� \"�ึ�:\" �ุ�สามาร�����ี�อยู�อี�มล�����ย���ุ�ม \"�ึ�:\" "
 "�ี�อยู��ั��า���อ���ิม��อ�วาม"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15604,63 +13448,63 @@ msgstr ""
 "�รุ�า�รว�สอ��ู�ห������ ว�า�ู�รั���ราย�ื�อ�หล�า�ี�สมั�ร���ละสามาร�รั��มล��รู���� HTML ���:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "Please provide an unique name to identify this signature."
 msgstr "�รุ�า�ั���ื�อ�ี��ม���ำ�ั��ื�ออื��สำหรั�ลาย�����ี�"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "Please wait."
 msgstr "�รุ�ารอสั��รู�"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "��ิ��ั�หา��ะย�าย��อมูล��ล��อร��มล���า \"{0}\""
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "�ำลั�สอ��าม��ิร���วอร�"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "�ำลั�สอ��ามราย�ื�อ�ล���ารยื�ยั��ัว�ุ��ล�ี���ิร���วอร�รอ�รั�"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "ร�อ��อ�าร����รั���อ�วาม�ล�ว"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "ล���ล��อร� \"{0}\" �ละ��ล��อร�ย�อย�ั��หม�หรือ�ม�?"
+msgstr "ยื�ยั�ว�า�ะล���ล��อร� \"{0}\" �ละ��ล��อร�ย�อย�ั��หม�หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
+msgid "Really delete folder \"{0}\"?"
+msgstr "ยื�ยั�ว�า�ะล���ล��อร� \"{0}\" หรือ�ม�?"
+
+#: ../mail/mail.error.xml.h:88
 msgid "Report Junk Failed"
 msgstr "ราย�า���อ�วาม�ยะ�ม�สำ�ร��"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "Report Not Junk Failed"
 msgstr "ราย�า���อ�วาม�ม�����ยะ�ม�สำ�ร��"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "�รั���อมูล��ล��อร����หา��ยอั���มั�ิ�ล�ว"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "Send Receipt"
 msgstr "ส���าร����รั�"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Signature Already Exists"
 msgstr "ลาย����มีอยู��ล�ว"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize"
 msgstr "�รั���อมูล"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
 msgid "Synchronize folders locally for offline usage?"
 msgstr "�ะ�รั���อมูล��ล��อร�ภาย����รื�อ� ��ื�อ�าร����า����ออ��ล��หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -15668,7 +13512,7 @@ msgstr ""
 "Evolution �ำ������อ������ล��อร�ระ�� �ึ��ะ�ำ�า����อย�า��ู���อ� �ึ��ม�สามาร���ลี�ย��ื�อ ย�าย "
 "หรือล����"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15677,13 +13521,13 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"ราย�ื�อ�ี�อยู��ิ���อ�ี��ุ��ำลั�ส���ู��ั����า�ว��ห���อ��ื�อ�ู�รั�\n"
+"ราย�ื�อ�ู��ิ���อ�ี��ุ��ำลั�ส���ู��ั����า�ว��ห���อ��ื�อ�ู�รั�\n"
 "\n"
 "ระ��อี�มลหลายระ���ะ��ิ�ม��อมูลส�ว�หัว Apparently-To ����อ�วาม�ี�มี����ู�รั�สำ��าลั�ล�ว�� "
 "�ึ����อมูล�ี��ะ�ส���ู�รั��ั��หม��อ���อ�วามอยู��ี �ุ�สามาร��ลี�ย��าร�ส����อมูล�ั��ล�าว��� "
 "��ย��ิ�ม�ู�รั�����อ� �ึ�: หรือ สำ��า: อย�า���อยห�ึ����"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15697,7 +13541,7 @@ msgstr ""
 "    \"{1}\"\n"
 "�ละ����รั���อมูล�หม��ล�ว"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15711,11 +13555,27 @@ msgstr ""
 "    \"{1}\"\n"
 "�ละ����รั���อมูล�หม��ล�ว"
 
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"�ู�รั���อ���ี�มี�ี�อยู��ี��ิ��า�รู�����อ��ี�อยู��มล:\n"
+"{0}"
+
 #: ../mail/mail.error.xml.h:111
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"�ู�รั���อ���ี�มี�ี�อยู��ี��ิ��า�รู�����อ��ี�อยู��มล:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
 msgstr "ส�ริ�����อ�มีอยู� �ละ��อ�สามาร��รีย��ำ�า����"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -15723,57 +13583,57 @@ msgstr ""
 "��ล��อร��ั��ล�าวอา��ู���ิ�ม���ามา��ย�ัย\n"
 "�รุ�า���ี���รื�อ�มือ�������ล��อร����หา��ื�อ��ิ�ม��ล��อร��ั��ล�าวอย�า��ั����� หา���อ��าร"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "�ม�สามาร�ส����อ�วาม�ี���� ��ราะ�ั��ี�ี��ุ��ลือ�ยั��ม���ิ����"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "�ม�สามาร�ส����อ�วาม�ี���� ��ราะ�ุ��ม����ระ�ุ�ื�อ�ู�รั�"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "��ิร���วอร��ี��ม�รอ�รั��ารยื�ยั��ัว�ุ��ลวิ�ี�ี� �ละอา��ม�รอ�รั��ารยื�ยั��ัว�ุ��ลวิ�ี���ลย"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "This signature has been changed, but has not been saved."
 msgstr "ลาย�����ี�มี�าร��ลี�ย���ล� ���ยั��ม�����ั��ึ�"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "�ะ�ำ��รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว����ล��อร��ี��ลือ��ละ����ล��อร�ย�อย�ั��หม�"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to connect to the GroupWise server."
 msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� GroupWise"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 "�ม�สามาร���ิ���ล��อร���หมายร�า�สำหรั��ั��ี�ี���� �ะ�����ล��อร���หมายร�า��อ�ระ�����หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to read license file."
 msgstr "�ม�สามาร�อ�า����มสั��าอ�ุ�า�"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid "Use _Default"
 msgstr "�����ล��อร�_�ริยาย"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:125
 msgid "Use default drafts folder?"
 msgstr "�����ล��อร���หมายร�า��ริยายหรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -15783,27 +13643,31 @@ msgstr ""
 "�อ��ุ���วย\n"
 "ยั�ยื�ยั��ี��ะล�หรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:128
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "�ุ��ม�มีสิ��ิ���ีย��อ�ี��ะล��มล�ี�"
+
+#: ../mail/mail.error.xml.h:129
 msgid "You have not filled in all of the required information."
 msgstr "�ุ���ิม��อมูล�ั��ั��ม��ร�"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:130
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "�ุ�มี��อ�วาม�ี�ยั��ม����ส�� �ุ���อ��ารออ��า���ร��รมหรือ�ม�?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "You may not create two accounts with the same name."
 msgstr "�ุ��ม�สามาร�สร�า�สอ��ั��ี��วย�ื�อ��ียว�ั����"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "You must name this Search Folder."
 msgstr "�ุ���อ��ั���ื�อ��ล��อร����หา�ี���วย"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid "You must specify a folder."
 msgstr "�ุ���อ�ระ�ุ��ล��อร�"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -15813,103 +13677,115 @@ msgstr ""
 "อา��ะ��ย�ลือ�����ราย��ล��อร� �ละ/หรือ ��ย�ลือ���ล��อร�����รื�อ��ั��หม� "
 "��ล��อร�����รือ��าย�ั��หม� หรือ�ั��สอ�อย�า�"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "�ารล��ั��ึ����า�����ิร���วอร� \"{0}\" �อ��ุ����ื�อ \"{0}\" ล�ม�หลว"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "_Append"
 msgstr "�_�ิ�ม��อ��าย"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid "_Discard changes"
 msgstr "�_ม�ส����าร��ลี�ย���ล�"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "_Do not Synchronize"
 msgstr "�_ม��รั���อมูล"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
+#: ../modules/mail/e-mail-shell-view-actions.c:866
+msgid "_Empty Trash"
+msgstr "�_��ยะ"
+
+#: ../mail/mail.error.xml.h:141
 msgid "_Expunge"
 msgstr "�_����วา�"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "_Open Messages"
 msgstr "�_�ิ���อ�วาม"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1119
 msgid "Unseen"
 msgstr "ยั��ม�อ�า�"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1120
 msgid "Seen"
 msgstr "อ�า��ล�ว"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1121
 msgid "Answered"
 msgstr "�อ��ล�ว"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1122
 msgid "Forwarded"
 msgstr "ส����อ�ล�ว"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1123
 msgid "Multiple Unseen Messages"
 msgstr "��อ�วามยั��ม�อ�า�หลาย��ั�"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1124
 msgid "Multiple Messages"
 msgstr "��อ�วามหลาย��ั�"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1128
 msgid "Lowest"
 msgstr "��ำ�ี�สุ�"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1129
 msgid "Lower"
 msgstr "��ำ�ว�า"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1133
 msgid "Higher"
 msgstr "สู��ว�า"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1134
 msgid "Highest"
 msgstr "สู��ี�สุ�"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "วั��ี� %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1760
 msgid "Yesterday %l:%M %p"
 msgstr "�มื�อวา� %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1772
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1780
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1782
 msgid "%b %d %Y"
 msgstr "%d %b %Ey"
 
+#: ../mail/message-list.c:2528
+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:3985 ../mail/message-list.c:4456
+#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
 msgid "Generating message list"
 msgstr "�ำลั�สร�า�ราย�าร��อ�วาม"
 
-#: ../mail/message-list.c:4295
+#: ../mail/message-list.c:4763
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15917,7 +13793,15 @@ msgstr ""
 "�ม�มี��อ�วาม�ี��ร��ั���ื�อ����าร���หา�อ��ุ� �รุ�าล�า��าร���หา��วย�ม�ู ���หา->ล�า� "
 "หรือ��ลี�ย���ื�อ���"
 
-#: ../mail/message-list.c:4297
+#: ../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
 msgid "There are no messages in this folder."
 msgstr "�ม�มี��อ�วาม����ล��อร��ี�"
 
@@ -15946,7 +13830,7 @@ msgid "Sent Messages"
 msgstr "��อ�วาม�ี�ส��"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "��า�"
 
@@ -15954,77 +13838,2125 @@ msgstr "��า�"
 msgid "Subject - Trimmed"
 msgstr "�ื�อ�รื�อ� - �ั�ส�ว���าย"
 
-#: ../mail/message-tag-followup.c:55
-msgid "Call"
-msgstr "�รีย�"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Do Not Forward"
-msgstr "�ม�ส����อ"
-
-#: ../mail/message-tag-followup.c:57
-msgid "Follow-Up"
-msgstr "��ะ�ระ�าศ�อ�"
-
-#: ../mail/message-tag-followup.c:58
-msgid "For Your Information"
-msgstr "สำหรั���อมูล�อ��ุ�"
-
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "ส����อ"
-
-#: ../mail/message-tag-followup.c:60
-msgid "No Response Necessary"
-msgstr "�ม��ำ������อ��อ�"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
-msgid "Reply"
-msgstr "�อ��ลั�"
-
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
-msgid "Reply to All"
-msgstr "�อ��ลั��ั��หม�"
-
-#: ../mail/message-tag-followup.c:65
-msgid "Review"
-msgstr "�รว��า�"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "Body contains"
 msgstr "�ัว��หมายมี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "Message contains"
 msgstr "��ื�อ�วามมี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
 msgid "Recipients contain"
 msgstr "�ู�รั�มี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "Sender contains"
 msgstr "�ู�ส��มี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "Subject contains"
 msgstr "�ื�อ�รื�อ�มี�ำว�า"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
-msgstr "�ื�อ�รื�อ�หรือ�ู�รั�มี�ำว�า"
+msgid "Subject or Addresses contains"
+msgstr "�ื�อ�รื�อ�หรือ�ี�อยู�มี�ำว�า"
+
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"�าร�ลือ��ัว�ลือ��ี�หมาย�วามว�า Evolution �ะ��ื�อม��อ�ั���ิร���วอร� LDAP �อ��ุ� "
+"����อ�มื�อ��ิร���วอร� LDAP �อ��ุ�รอ�รั� SSL ���า�ั��"
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"�าร�ลือ��ัว�ลือ��ี�หมาย�วามว�า Evolution �ะ��ื�อม��อ�ั���ิร���วอร� LDAP �อ��ุ� "
+"����อ�มื�อ��ิร���วอร� LDAP �อ��ุ�รอ�รั� TLS ���า�ั��"
+
+#: ../modules/addressbook/addressbook-config.c:210
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"�าร�ลือ��ัว�ลือ��ี�หมาย�วามว�า��ิร���วอร��อ��ุ��ม�รอ�รั��ั�� SSL หรือ TLS "
+"�ึ����หมาย�วามว�า�าร��ื�อม��อ�อ��ุ��ะ�ม��ิรภัย �ละ�สี�ย���อ�ารลั�ลอ������อมูล���"
+
+#: ../modules/addressbook/addressbook-config.c:592
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "�������ิ�ิ�_วั���ิ� & วั��ร�รอ��ี"
+
+#: ../modules/addressbook/addressbook-config.c:628
+msgid "Copy _book content locally for offline operation"
+msgstr "�ั�ลอ���ื�อหา_สมุ��ี�อยู��ว��ี���รื�อ���ื�อ�าร�ำ�า����ออ��ล��"
+
+#: ../modules/addressbook/addressbook-config.c:736
+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 "
+"port you should specify."
+msgstr ""
+"�ี��ือ�อร������ิร���วอร� LDAP �ี� Evolution �ะ��ื�อม��อ�� �ื�อ�อ��อร��มา�ร�า��ะมี�ว��ห�อยู��ล�ว "
+"�ะ��อ��าม�ู��ู�ลระ���อ��ุ�ว�า�อร���ห��ี��ุ���อ�ระ�ุ"
+
+#: ../modules/addressbook/addressbook-config.c:810
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"�ี��ือวิ�ี�ี� Evolution �ะ���ยื�ยั��ัว�ุ��ล�อ��ุ� สั����ว�า�าร�ั����า���� \"�ี�อยู�อี�มล\" "
+"�ะ��อ����า�ึ���ิร���วอร� LDAP �อ��ุ�����ิร�าม�����วย"
+
+#: ../modules/addressbook/addressbook-config.c:885
+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 "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"�อ�����าร���หา�ะ�ำห��ว�า�ุ���อ��าร�ห��าร���หา�ยายลึ�ล������า�ร�อ�สาร�� �อ�����าร���หา "
+"\"ย�อย\" �ะรวม�ุ�ราย�าร�ี�อยู�����ุ��ั��������หา�อ��ุ� �อ�����าร���หา \"ระ�ั���ียว\" "
+"�ะรวมราย�าร�ี�อยู�����ุ��ั��������หา�อ��ุ���ีย�ระ�ั���ียว���า�ั��"
+
+#: ../modules/addressbook/addressbook-config.c:991
+msgid "Server Information"
+msgstr "��อมูล��ิร���วอร�"
+
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "รายละ�อีย�"
+
+#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
+msgid "Searching"
+msgstr "�าร���หา"
+
+#: ../modules/addressbook/addressbook-config.c:999
+msgid "Downloading"
+msgstr "�าร�าว���หล�"
+
+#: ../modules/addressbook/addressbook-config.c:1205
+msgid "Address Book Properties"
+msgstr "�ุ�สม�ั�ิสมุ��ี�อยู�"
+
+#: ../modules/addressbook/addressbook-config.c:1207
+msgid "New Address Book"
+msgstr "สมุ��ี�อยู��หม�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "�วามยาว��ิม���ม�ำอั���มั�ิ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "Contact layout style"
+msgstr "รู�����าร�ั�ห��า�อ�ู��ิ���อ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า��ู��ิ���อ (��ว�อ�)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr "�ำ�ห����ส���ั����อ��ส���ัวอย�า��ู��ิ���อ (��ว�ั��)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList XML สำหรั�ราย�ื�อ URI สำหรั���ิม���ม"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList XML สำหรั�ราย�ื�อ URI สำหรั���ิม���ม"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr "�ำ�ห����อ��ส���ั����อ��ส���ัวอย�า��ู��ิ���อ �มื�อ�ั�วา�����ว�อ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr "�ำ�ห����อ��ส���ั����อ��ส���ัวอย�า��ู��ิ���อ �มื�อ�ั�วา�����ว�ั��"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "�ส���ื�อ�ี���ิม���มอั���มั�ิ�ร�อม�ี�อยู�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "�ส����อ��ส���ัวอย�า�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"รู�����าร�ั�ห��า�อ�ะ�ำห���ำ�ห����อ���อ��ส���ัวอย�า���ีย��ั�ราย�ื�อ�ู��ิ���อ \"0\" "
+"(�����ั�) �ะวา���อ��ส���ัวอย�า��ว����ราย�ื�อ�ู��ิ���อ \"1\" (�����ว�ั��) "
+"�ะวา���อ��ส���ัวอย�า��ว���า�ราย�ื�อ�ู��ิ���อ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "�ำ�ว�อั��ระ�ี��ะ��อ���อ� ��อ��ี� Evolution �ะ�ยายาม��ิม���มส�ว��ี��หลือ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "URI �อ���ล��อร��ี����ล�าสุ����ล�อ�����อ��ลือ��ื�อ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI �อ���ล��อร��ี����ล�าสุ����ล�อ�����อ��ลือ��ื�อ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "�ำห��ว�า�ะ�ั��ั��ห��ส���ี�อยู�อี�มล�ร�อม�ื�อ�อ��ู��ิ���อ�ี���ิม���มอั���มั�ิ����อ���อ�หรือ�ม�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "�ำห��ว�า�ะ�ส����อ��ส���ัวอย�า�หรือ�ม�"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+msgid "Table column:"
+msgstr "�อลัม���ารา�:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "�าร��ิม�ำอั���มั�ิ"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+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
+msgid "On LDAP Servers"
+msgstr "����ิร���วอร� LDAP"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "�ี�อยู�_�ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
+msgid "Create a new contact"
+msgstr "สร�า��ู��ิ���อ�หม�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "ราย_�ื�อ�ู��ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
+msgid "Create a new contact list"
+msgstr "สร�า�ราย�ื�อ�ู��ิ���อ�หม�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "_สมุ��ี�อยู�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
+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/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+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
+msgid "Save as vCard"
+msgstr "�ั��ึ����� vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
+msgid "Co_py All Contacts To..."
+msgstr "�ั�_ลอ��ู��ิ���อ�ั��หม���ยั�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
+msgid "Copy the contacts of the selected address book to another"
+msgstr "�ั�ลอ��ู��ิ���อ��สมุ��ี�อยู��ี��ลือ���ยั��ล�มอื��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
+msgid "D_elete Address Book"
+msgstr "ล_�สมุ��ี�อยู�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
+msgid "Delete the selected address book"
+msgstr "ล�สมุ��ี�อยู��ี��ลือ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
+msgid "Mo_ve All Contacts To..."
+msgstr "_ย�าย�ู��ิ���อ�ั��หม���ยั�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
+msgid "Move the contacts of the selected address book to another"
+msgstr "ย�าย�ู��ิ���อ��สมุ��ี�อยู��ี��ลือ���ยั��ล�มอื��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
+msgid "_New Address Book"
+msgstr "สมุ��ี�อยู��_หม�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
+msgid "Address _Book Properties"
+msgstr "�ุ�สม�ั�ิ_สมุ��ี�อยู�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
+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
+msgid "_Rename..."
+msgstr "��ลี�ย�_�ื�อ..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+msgid "Rename the selected address book"
+msgstr "��ลี�ย��ื�อสมุ��ี�อยู��ี��ลือ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
+msgid "S_ave Address Book as vCard"
+msgstr "�ั�_�ึ�สมุ��ี�อยู���รู� vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "�ั��ึ��ู��ิ���อ��สมุ��ี�อยู��ลือ���รู� vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
+msgid "Stop loading"
+msgstr "หยุ��หล�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
+msgid "_Copy Contact To..."
+msgstr "_�ั�ลอ��ู��ิ���อ��ยั�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
+msgid "Copy selected contacts to another address book"
+msgstr "�ั�ลอ��ู��ิ���อ�ี��ลือ���ยั�สมุ��ี�อยู��ล�มอื��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
+msgid "_Delete Contact"
+msgstr "_ล��ู��ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
+msgid "_Find in Contact..."
+msgstr "_หา����อมูล�ู��ิ���อ..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+msgid "Search for text in the displayed contact"
+msgstr "���หา��อ�วาม����อมูล�ู��ิ���อ�ี��ส��อยู�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
+msgid "_Forward Contact..."
+msgstr "ส��_��อ��อมูล�ู��ิ���อ..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
+msgid "Send selected contacts to another person"
+msgstr "ส����อมูล�ู��ิ���อ�ี��ลือ����ห��ู�อื��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
+msgid "_Move Contact To..."
+msgstr "_ย�าย�ู��ิ���อ��ยั�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
+msgid "Move selected contacts to another address book"
+msgstr "ย�าย�ู��ิ���อ�ี��ลือ���ยั�สมุ��ี�อยู��ล�มอื��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
+msgid "_New Contact..."
+msgstr "�ู��ิ���อ�_หม�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
+msgid "New Contact _List..."
+msgstr "_ราย�ื�อ�ู��ิ���อ�หม�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
+msgid "_Open Contact"
+msgstr "_��ิ���อมูล�ู��ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
+msgid "View the current contact"
+msgstr "�ู��อมูล�ู��ิ���อ�ั��ุ�ั�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
+msgid "_Send Message to Contact..."
+msgstr "_ส����อ�วาม��ยั��ู��ิ���อ..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
+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
+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
+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
+msgid "_Delete"
+msgstr "_ล�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
+msgid "_Properties"
+msgstr "�ุ�_สม�ั�ิ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
+msgid "_Save as vCard..."
+msgstr "_�ั��ึ����� vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
+msgid "Contact _Preview"
+msgstr "�ู_�ัวอย�า��ู��ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
+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
+msgid "_Classic View"
+msgstr "มุมมอ��_����ั�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
+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
+msgid "_Vertical View"
+msgstr "มุมมอ���ว_�ั��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
+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
+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
+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
+msgid "Advanced Search"
+msgstr "�าร���หา�ั��สู�"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Sender contains"
-msgstr "�ื�อ�รื�อ�หรือ�ู�ส��มี�ำว�า"
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+msgid "Print all shown contacts"
+msgstr "�ิม����อมูล�ู��ิ���อ�ั��หม��ี��ส��อยู�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "Preview the contacts to be printed"
+msgstr "�ส���ัวอย�า���อมูล�ู��ิ���อ��อ��ิม��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
+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
+msgid "Save selected contacts as a vCard"
+msgstr "�ั��ึ���อมูล�ู��ิ���อ�ี��ลือ���รู� vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "_ส����อ�ี�อยู��ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "_ส����อ�ี�อยู��ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+msgid "_Send Message to Contacts"
+msgstr "_ส����อ�วาม��ยั��ู��ิ���อ"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "_Send Message to List"
+msgstr "_ส����อ�วาม��ยั�ลิส��"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+msgid "_Send Message to Contact"
+msgstr "_ส����อ�วาม��ยั��ู��ิ���อ"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "vCard หลายราย�าร"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard สำหรั� %s"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "��อมูล�ู��ิ���อ"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "��อมูล�ี�อยู��ิ���อ�อ� %s"
+
+#: ../modules/addressbook/ldap-config.ui.h:1
+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"
+
+#: ../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
+msgid "B_rowse this book until limit reached"
+msgstr "�_รีย��ูสมุ��ี�อยู��ี����ว�า�ะ�ึ��ี��ำ�ั��ี��ำห���ว�"
+
+#: ../modules/addressbook/ldap-config.ui.h:9
+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
+msgid "One"
+msgstr "ระ�ั���ียว"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search Filter"
+msgstr "�ัว�รอ�สำหรั����หา"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _base:"
+msgstr "_�ุ��ั��������หา:"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "Search _filter:"
+msgstr "�ัว_�รอ�สำหรั����หา:"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+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\"."
+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
+msgid "Sub"
+msgstr "ย�อย"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Supported Search Bases"
+msgstr "�ุ��ั��������หา�ี�รอ�รั�"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using distinguished name (DN)"
+msgstr "�ะ��� distinguished name (DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "Using email address"
+msgstr "�ะ����ี�อยู�อี�มล"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Download limit:"
+msgstr "_�ำ�ั��าร�าว���หล�:"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Find Possible Search Bases"
+msgstr "_หา�ุ��ั��������หา�ี����������"
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Login method:"
+msgstr "_วิ�ี�าร���าระ��:"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Port:"
+msgstr "_�อร��:"
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Search scope:"
+msgstr "_�อ�����าร���หา:"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "�ำ�ั��_วลา:"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Use secure connection:"
+msgstr "�_���าร��ื�อม��อ�ิรภัย:"
+
+#: ../modules/addressbook/ldap-config.ui.h:33
+msgid "cards"
+msgstr "�าม�ั�ร"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "�ำ�_��า"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "�ลือ���ิ�ิ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "�ลือ�ราย�ารภาร�ิ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "�ำ�_��าล�����ิ�ิ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+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-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
+msgid "On The Web"
+msgstr "���ว��"
+
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "ราย�า�อา�าศ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "วั���ิ� & วั��ร�รอ��ี"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_�ั�หมาย"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+msgid "Create a new appointment"
+msgstr "สร�า��ั�หมาย�หม�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "�ั�หมาย_�ลอ��ั��วั�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "สร�า��าร�ระ�ุม�ลอ��ั��วั��หม�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "�าร_�ระ�ุม"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "สร�า��าร�อ�าร�ระ�ุม�หม�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "_��ิ�ิ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+msgid "Create a new calendar"
+msgstr "สร�า���ิ�ิ��หม�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2657
+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-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"��ิ���อ�ิ��ลา��ี� %s\n"
+"%s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
+msgid "Loading calendars"
+msgstr "�ำลั��หล���ิ�ิ�"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
+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
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "�ำลั���ิ���ิ�ิ��ี� %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "�ิม��"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"��ิ�ั�ิ�าร�ี��ะล��ห�ุ�าร���ุ�อย�า��ี����า�ว�า�วลา�ี��ำห���ว� หา��ุ��ำ��ิ��าร��อ�� "
+"�ะ�ม�สามาร��รีย���อมูล�ห�ุ�าร���หล�า�ี�����ลั��ื�มา���อี�"
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "ล��ห�ุ�าร���ี����า�ว�า"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
+msgid "Copying Items"
+msgstr "�ำลั��ั�ลอ�ราย�าร"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
+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
+msgid "event"
+msgstr "�ห�ุ�าร��"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
+#: ../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
+msgid "Save as iCalendar"
+msgstr "�ั��ึ����� iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Copy..."
+msgstr "_�ั�ลอ�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+msgid "D_elete Calendar"
+msgstr "_ล���ิ�ิ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+msgid "Delete the selected calendar"
+msgstr "ล���ิ�ิ��ี��ลือ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+msgid "Go Back"
+msgstr "ย�อ��ลั�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+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
+msgid "Select today"
+msgstr "�ลือ�วั��ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+msgid "Select _Date"
+msgstr "�ลือ�วั�_�ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+msgid "Select a specific date"
+msgstr "ระ�ุวั��ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+msgid "_New Calendar"
+msgstr "��ิ�ิ��_หม�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+msgid "Purg_e"
+msgstr "�_����วา�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+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
+msgid "Re_fresh"
+msgstr "�รั��_ส��"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+msgid "Refresh the selected calendar"
+msgstr "�รั���อมูล��ิ�ิ��ี��ลือ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+msgid "Rename the selected calendar"
+msgstr "��ลี�ย��ื�อ��ิ�ิ��ี��ลือ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+msgid "Show _Only This Calendar"
+msgstr "�_ส�����าะ��ิ�ิ��ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+msgid "Cop_y to Calendar..."
+msgstr "_�ั�ลอ���ยั���ิ�ิ�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+msgid "_Delegate Meeting..."
+msgstr "มอ�หมาย�ระ�ุม�_��..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+msgid "_Delete Appointment"
+msgstr "_ล��ั�หมาย"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+msgid "Delete selected appointments"
+msgstr "ล��ั�หมาย�ี��ลือ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+msgid "Delete This _Occurrence"
+msgstr "_ล��ั�หมายรอ��ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+msgid "Delete this occurrence"
+msgstr "ล��ั�หมายรอ��ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+msgid "Delete All Occ_urrences"
+msgstr "ล��ุ_�รอ��อ��ั�หมาย"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Delete all occurrences"
+msgstr "ล��ุ�รอ��อ��ั�หมาย�ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+msgid "New All Day _Event..."
+msgstr "�_ห�ุ�าร���ั��วั�ราย�าร�หม�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "Create a new all day event"
+msgstr "สร�า��ห�ุ�าร���ลอ��ั��วั�ราย�าร�หม�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../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
+msgid "_Forward as iCalendar..."
+msgstr "ส��_��อ���� iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "New _Meeting..."
+msgstr "�าร�ระ�ุม�_หม�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+msgid "Create a new meeting"
+msgstr "สร�า��าร�ระ�ุมราย�าร�หม�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+msgid "Mo_ve to Calendar..."
+msgstr "_ย�าย��ยั���ิ�ิ�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "New _Appointment..."
+msgstr "�ั�หมาย�_หม�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+msgid "Make this Occurrence _Movable"
+msgstr "�ห��ห�ุ�าร���รั���ี��_�ลื�อ�ย�าย���"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+msgid "_Open Appointment"
+msgstr "�_�ิ��ั�หมาย"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+msgid "View the current appointment"
+msgstr "�ู�ั�หมาย�ั��ุ�ั�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+msgid "_Reply"
+msgstr "_�อ��ลั�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+msgid "Save as iCalendar..."
+msgstr "�ั��ึ����� iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+msgid "_Schedule Meeting..."
+msgstr "_�ั��วลา�ระ�ุม..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+msgid "Converts an appointment to a meeting"
+msgstr "��ล��ั�หมาย�ห������าร�ระ�ุม"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "Conv_ert to Appointment..."
+msgstr "��ล_������ั�หมาย..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+msgid "Converts a meeting to an appointment"
+msgstr "��ล��าร�ระ�ุม�ห������ั�หมาย"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+msgid "Day"
+msgstr "วั�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+msgid "Show one day"
+msgstr "�ส��วั���ียว"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+msgid "List"
+msgstr "ราย�าร"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+msgid "Show as list"
+msgstr "�ส������ราย�าร"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+msgid "Month"
+msgstr "��ือ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+msgid "Show one month"
+msgstr "�ส����ือ���ียว"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+msgid "Week"
+msgstr "สั��าห�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+msgid "Show one week"
+msgstr "�ส��สั��าห���ียว"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+msgid "Show one work week"
+msgstr "�ส��สั��าห��ำ�า�สั��าห���ียว"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+msgid "Active Appointments"
+msgstr "�ั�หมาย�ี�มี�ลอยู�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+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
+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
+msgid "Summary contains"
+msgstr "สรุ�มี�ำว�า"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+msgid "Print this calendar"
+msgstr "�ิม����ิ�ิ��ี�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+msgid "Preview the calendar to be printed"
+msgstr "�ส���ัวอย�า���ิ�ิ���อ��ิม��"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+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
+msgid "memo"
+msgstr "�ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+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
+msgid "Create a new memo"
+msgstr "สร�า��ั��ึ���วย�ำราย�าร�หม�"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+msgid "_Open Memo"
+msgstr "_��ิ��ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+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
+msgid "Open _Web Page"
+msgstr "��ิ�ห��า_�ว��"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+msgid "Print the selected memo"
+msgstr "�ิม���ั��ึ���วย�ำ�ี��ลือ�"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. 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
+msgid "task"
+msgstr "ภาร�ิ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:671
+msgid "_Assign Task"
+msgstr "_มอ�หมายภาร�ิ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "_Mark as Complete"
+msgstr "_�ำ��รื�อ�หมายว�า�สร���ล�ว"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+msgid "Mark selected tasks as complete"
+msgstr "�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�า�สร���ล�ว"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "_�ำ��รื�อ�หมายว�ายั��ม��สร��"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:757
+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
+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
+msgid "Create a new task"
+msgstr "สร�า�ภาร�ิ�ราย�าร�หม�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "_Open Task"
+msgstr "_��ิ�ภาร�ิ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+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
+msgid "_Save as iCalendar..."
+msgstr "�ั��ึ����_� iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:997
+msgid "Print the selected task"
+msgstr "�ิม��ภาร�ิ��ี��ลือ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "�ั��ึ�_��วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "�ั��ึ���วย�ำ���_ร�วม"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+msgid "Create a new shared memo"
+msgstr "สร�า��ั��ึ���วย�ำ���ร�วมราย�าร�หม�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "_ราย�าร�ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+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
+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
+#, c-format
+msgid "Opening memos at %s"
+msgstr "�ำลั���ิ��ั��ึ���วย�ำ�ี� %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "�ิม���ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
+msgid "_Delete Memo"
+msgstr "_ล��ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
+msgid "_Find in Memo..."
+msgstr "_หา���ั��ึ���วย�ำ..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
+msgid "Search for text in the displayed memo"
+msgstr "���หา��อ�วาม���ั��ึ���วย�ำ�ี��ส��อยู�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+msgid "D_elete Memo List"
+msgstr "_ล�ราย�าร�ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "Delete the selected memo list"
+msgstr "ล�ราย�าร�ั��ึ���วย�ำ�ี��ลือ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+msgid "_New Memo List"
+msgstr "ราย�าร�ั��ึ���วย�ำ�ห_ม�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "Refresh the selected memo list"
+msgstr "�รั���อมูลราย�าร�ั��ึ���วย�ำ�ี��ลือ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+msgid "Rename the selected memo list"
+msgstr "��ลี�ย��ื�อราย�าร�ั��ึ���วย�ำ�ี��ลือ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+msgid "Show _Only This Memo List"
+msgstr "�ส�����าะ_ราย�าร�ั��ึ���วย�ำ�ี�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
+msgid "Memo _Preview"
+msgstr "�ส��_�ัวอย�า��ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
+msgid "Show memo preview pane"
+msgstr "�ส����อ��ส���ัวอย�า��ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
+msgid "Show memo preview below the memo list"
+msgstr "�ส���ัวอย�า��ั��ึ���วย�ำ���ราย�าร�ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+msgid "Show memo preview alongside the memo list"
+msgstr "�ส���ัวอย�า��ั��ึ���วย�ำ��า�ราย�าร�ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+msgid "Print the list of memos"
+msgstr "�ิม��ราย�าร�ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+msgid "Preview the list of memos to be printed"
+msgstr "�ส���ัวอย�า�ราย�าร�ั��ึ���วย�ำ��อ��ิม��"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:416
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "�ั��ึ���วย�ำ %d ราย�าร"
+msgstr[1] "�ั��ึ���วย�ำ %d ราย�าร"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
+#, c-format
+msgid "%d selected"
+msgstr "�ลือ�อยู� %d ราย�าร"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+msgid "Delete Memos"
+msgstr "ล��ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+msgid "Delete Memo"
+msgstr "ล��ั��ึ���วย�ำ"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+msgctxt "New"
+msgid "_Task"
+msgstr "_ภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "ภาร�ิ��ี����รั�_มอ�หมาย"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "สร�า�ภาร�ิ��ี����รั�มอ�หมาย�หม�"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "ราย�ารภาร�ิ_�"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+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
+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
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "�ำลั���ิ�ภาร�ิ��ี� %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+msgid "Print Tasks"
+msgstr "�ิม��ภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:553
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"��ิ�ั�ิ�าร�ี��ะล�ภาร�ิ��ั��หม��ี�มี�าร�ำ��รื�อ�หมาย�ว�ว�า�สร���ล�ว ��า�ุ��ำ��อ�� "
+"�ะ�ม�สามาร��รีย�ภาร�ิ��ั��หม��ั���ื�มา���อี�\n"
+"\n"
+"�ุ���อ��ารล�ภาร�ิ��ั��หม��ี��ริ�� หรือ�ม�?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:678
+msgid "_Delete Task"
+msgstr "_ล�ภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:685
+msgid "_Find in Task..."
+msgstr "_หา��ภาร�ิ�..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:687
+msgid "Search for text in the displayed task"
+msgstr "���หา��อ�วาม��ภาร�ิ��ี��ส��อยู�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:699
+msgid "Copy..."
+msgstr "�ั�ลอ�..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:706
+msgid "D_elete Task List"
+msgstr "ล_�ราย�ารภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "Delete the selected task list"
+msgstr "ล�ราย�ารภาร�ิ��ี��ลือ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:713
+msgid "_New Task List"
+msgstr "ราย�ารภาร�ิ��_หม�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Refresh the selected task list"
+msgstr "�รั���อมูลราย�ารภาร�ิ��ี��ลือ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "Rename the selected task list"
+msgstr "��ลี�ย��ื�อราย�ารภาร�ิ��ี��ลือ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:741
+msgid "Show _Only This Task List"
+msgstr "�ส�����าะราย�าร_ภาร�ิ��ี�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+msgid "Mar_k as Incomplete"
+msgstr "_�ำ��รื�อ�หมายว�ายั��ม��สร��"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+msgid "Delete completed tasks"
+msgstr "ล�ภาร�ิ��ี��สร���ล�ว"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:860
+msgid "Task _Preview"
+msgstr "_�ัวอย�า�ภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:862
+msgid "Show task preview pane"
+msgstr "�ส����อ��ส���ัวอย�า�ภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:883
+msgid "Show task preview below the task list"
+msgstr "�ส���ัวอย�า�ภาร�ิ����ราย�ารภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:890
+msgid "Show task preview alongside the task list"
+msgstr "�ส���ัวอย�า�ภาร�ิ���า�ราย�ารภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+msgid "Active Tasks"
+msgstr "ภาร�ิ��ี��ำลั��ำอยู�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+msgid "Completed Tasks"
+msgstr "ภาร�ิ��ี��สร���ล�ว "
+
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+msgid "Next 7 Days' Tasks"
+msgstr "ภาร�ิ��อ� 7 วั���า�ห��า"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+msgid "Overdue Tasks"
+msgstr "ภาร�ิ��ี��ลย�ำห��"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Tasks with Attachments"
+msgstr "ภาร�ิ��ี�มี���ม���"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+msgid "Print the list of tasks"
+msgstr "�ิม��ราย�ารภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:990
+msgid "Preview the list of tasks to be printed"
+msgstr "�ส���ัวอย�า�ราย�ารภาร�ิ���อ��ิม��"
+
+#: ../modules/calendar/e-task-shell-view-private.c:463
+msgid "Expunging"
+msgstr "�ำลั������วา�"
+
+#: ../modules/calendar/e-task-shell-view-private.c:565
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d ภาร�ิ�"
+msgstr[1] "%d ภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+msgid "Delete Tasks"
+msgstr "ล�ภาร�ิ�"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+msgid "Delete Task"
+msgstr "ล�ภาร�ิ�"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, 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
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "��อ�วาม�_มล"
+
+#: ../modules/mail/e-mail-shell-backend.c:170
+msgid "Compose a new mail message"
+msgstr "��ีย��มล��ั��หม�"
+
+#: ../modules/mail/e-mail-shell-backend.c:178
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "�_�ล��อร��มล"
+
+#: ../modules/mail/e-mail-shell-backend.c:180
+msgid "Create a new mail folder"
+msgstr "สร�า���ล��อร��มล�หม�"
+
+#: ../modules/mail/e-mail-shell-backend.c:199
+msgid "Mail Accounts"
+msgstr "�ั��ี�มล"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "�รั�����ระ���มล"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
+msgid "Composer Preferences"
+msgstr "�รั������าร��ีย���อ�วาม"
+
+#: ../modules/mail/e-mail-shell-backend.c:223
+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.c:875
+msgid "_Disable Account"
+msgstr "�ิ_�����ั��ี"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:861
+msgid "Disable this account"
+msgstr "�ิ�����ั��ี�ี�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:868
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "ล���อ�วาม�ี�สั��ล��ว�ออ��า��ุ���ล��อร�อย�า��าวร"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:873
+msgid "C_reate Search Folder From Search..."
+msgstr "_สร�า���ล��อร����หา�า��าร���หา..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+msgid "_Download Messages for Offline Usage"
+msgstr "_�าว���หล���อ�วามสำหรั�����า����ออ��ล��"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:882
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "�าว���หล���อ�วาม�อ��ั��ี�ละ��ล��อร��ี��ำ��รื�อ�หมายออ��ล���ว�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:887
+msgid "Fl_ush Outbox"
+msgstr "_�ั�ส����หมายออ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:894
+msgid "_Copy Folder To..."
+msgstr "_�ั�ลอ���ล��อร���ยั�..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:896
+msgid "Copy the selected folder into another folder"
+msgstr "�ั�ลอ���ล��อร��ี��ลือ���ยั���ล��อร�อื��"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:903
+msgid "Permanently remove this folder"
+msgstr "ล���ล��อร��ี�อย�า��าวร"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:908
+msgid "E_xpunge"
+msgstr "�_����วา�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:910
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "�วา���อ�วาม�ั��หม��ี�สั��ล��ว�����ล��อร��ี��ิ��อย�า��าวร"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:915
+msgid "Mar_k All Messages as Read"
+msgstr "�ำ�_�รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:917
+msgid "Mark all messages in the folder as read"
+msgstr "�ำ��รื�อ�หมาย�ุ���อ�วาม����ล��อร��ี�ว�าอ�า��ล�ว"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:922
+msgid "_Move Folder To..."
+msgstr "_ย�าย��ล��อร���ยั�..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:924
+msgid "Move the selected folder into another folder"
+msgstr "ย�าย��ล��อร��ี��ลือ���ยั���ล��อร�อื��"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:929
+msgid "_New..."
+msgstr "�_หม�..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:931
+msgid "Create a new folder for storing mail"
+msgstr "สร�า���ล��อร��หม�สำหรั��าร�����มล"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:938
+msgid "Change the properties of this folder"
+msgstr "��ลี�ย��ุ�สม�ั�ิ�อ���ล��อร��ี�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:945
+msgid "Refresh the folder"
+msgstr "�รั��ส����ล��อร��หม�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:952
+msgid "Change the name of this folder"
+msgstr "��ลี�ย��ื�อ�อ���ล��อร��ี�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:957
+msgid "Select Message _Thread"
+msgstr "�ลือ�_�ระ�ู���อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:959
+msgid "Select all messages in the same thread as the selected message"
+msgstr "�ลือ���อ�วาม�ั��หม��ี�อยู����ระ�ู���ียว�ั���อ�วาม�ี��ลือ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:964
+msgid "Select Message S_ubthread"
+msgstr "�ลือ��ระ�ู�_ย�อย�อ���อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:966
+msgid "Select all replies to the currently selected message"
+msgstr "�ลือ���อ�วาม�ั��หม��ี��อ���อ�วาม�ี��ลือ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:971
+msgid "_Unsubscribe"
+msgstr "�_ลิ��อ�รั�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:973
+msgid "Unsubscribe from the selected folder"
+msgstr "�ลิ��อ�รั���อมูล�า���ล��อร��ี��ลือ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:978
+msgid "Empty _Trash"
+msgstr "��_�ั��ยะ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:980
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "ล���อ�วาม�ี�สั��ล��ว�ออ��า��ุ��ั��ีอย�า��าวร"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:985
+msgid "_New Label"
+msgstr "��าย�_หม�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:994
+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
+msgid "Cancel the current mail operation"
+msgstr "ย��ลิ���ิ�ั�ิ�าร�มล�ั��ุ�ั�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
+msgid "Collapse All _Threads"
+msgstr "ยุ�_�ระ�ู��ั��หม�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
+msgid "Collapse all message threads"
+msgstr "ยุ��ระ�ู���อ�วาม�ั��หม�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
+msgid "E_xpand All Threads"
+msgstr "_�ยาย�ระ�ู��ั��หม�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
+msgid "Expand all message threads"
+msgstr "�ยาย�ระ�ู���อ�วาม�ั��หม�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
+msgid "_Message Filters"
+msgstr "�ัว_�รอ���อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
+msgid "Create or edit rules for filtering new mail"
+msgstr "สร�า�หรือ�������สำหรั��าร�รอ��มล�หม�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
+msgid "Search F_olders"
+msgstr "�_�ล��อร����หา"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
+msgid "Create or edit search folder definitions"
+msgstr "สร�า�หรือ�������อ�ำห��สำหรั���ล��อร����หา"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
+msgid "_Subscriptions..."
+msgstr "�าร_�อ�รั���อมูล..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "�อ�รั�หรือ�ลิ��อ�รั���อมูล�า���ิร���วอร�ภาย�อ��ห��ั���ล��อร�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
+msgid "F_older"
+msgstr "�_�ล��อร�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
+msgid "_Label"
+msgstr "�ิ�_��าย"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
+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
+msgid "Show Message _Preview"
+msgstr "�ส��_�ัวอย�า���อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
+msgid "Show message preview pane"
+msgstr "�ส����อ��ส���ัวอย�า���อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
+msgid "_Group By Threads"
+msgstr "�ั��ลุ�ม�าม_�ระ�ู�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
+msgid "Threaded message list"
+msgstr "�รีย���อ�วาม�����ระ�ู�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
+msgid "Show message preview below the message list"
+msgstr "�ส���ัวอย�า���อ�วาม���ราย�าร��อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+msgid "Show message preview alongside the message list"
+msgstr "�ส���ัวอย�า���อ�วาม��า�ราย�าร��อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
+msgid "All Messages"
+msgstr "�ุ���อ�วาม"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
+msgid "Important Messages"
+msgstr "��อ�วามสำ�ั�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "Last 5 Days' Messages"
+msgstr "��อ�วามภาย�� 5 วั���อ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
+msgid "Messages Not Junk"
+msgstr "��อ�วาม�ี��ม�����มล�ยะ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
+msgid "Messages with Attachments"
+msgstr "��อ�วาม�ี�มี���ม���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
+msgid "No Label"
+msgstr "�ม�มี��าย"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
+msgid "Read Messages"
+msgstr "��อ�วาม�ี�อ�า��ล�ว"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1255
+msgid "Recent Messages"
+msgstr "��อ�วามล�าสุ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
+msgid "Unread Messages"
+msgstr "��อ�วาม�ี�ยั��ม����อ�า�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
+msgid "Subject or Addresses contain"
+msgstr "�ื�อ�รื�อ�หรือ�ี�อยู���า�� มี�ำว�า"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+msgid "All Accounts"
+msgstr "�ุ��ั��ี"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+msgid "Current Account"
+msgstr "�ั��ี�ั��ุ�ั�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
+msgid "Current Folder"
+msgstr "��ล��อร��ั��ุ�ั�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:891
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "�ลือ�อยู� %d ราย�าร, "
+msgstr[1] "�ลือ�อยู� %d ราย�าร, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:902
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "ล���อ�วาม�� %d ��ั�"
+msgstr[1] "ล���อ�วาม�� %d ��ั�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../modules/mail/e-mail-shell-view-private.c:915
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "�มล�ยะ %d ��ั�"
+msgstr[1] "�มล�ยะ %d ��ั�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:921
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "��หมายร�า� %d ��ั�"
+msgstr[1] "��หมายร�า� %d ��ั�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:927
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "ยั��ม�ส�� %d ��ั�"
+msgstr[1] "ยั��ม�ส�� %d ��ั�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:933
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "ส���ล�ว %d ��ั�"
+msgstr[1] "ส���ล�ว %d ��ั�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:945
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "ยั��ม�อ�า� %d, "
+msgstr[1] "ยั��ม�อ�า� %d, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:948
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "รวม %d"
+msgstr[1] "รวม %d"
+
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "�าร���หา�ั��ี�ั��หม�"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "�าร���หา�ั��ี"
+
+#: ../modules/mail/e-mail-shell-view.c:873
+msgid "Proxy _Logout"
+msgstr "_ออ��า��าร���าระ�����า�ะ�ัว���"
+
+#: ../modules/mail/em-composer-prefs.c:473
+msgid "Language(s)"
+msgstr "ภาษา"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "�ุ��วลา"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "ห�ึ���รั����อวั�"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "ห�ึ���รั����อสั��าห�"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "ห�ึ���รั����อ��ือ�"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "��ิ�ม��อมูลส�ว�หัว�ำห���อ��อ��ยะ"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "�ื�อ��อมูลส�ว�หัว:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+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
+msgid "Header"
+msgstr "หัว�ระ�าษ"
+
+#: ../modules/mail/em-mailer-prefs.c:329
+msgid "Contains Value"
+msgstr "มี�ำว�า"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#, 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
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "�ม�มี�ลั��อิ� %s �รุ�า�รว�สอ�ว�า����ิ��ั��������หรือ�ม�"
+
+#: ../modules/mail/em-mailer-prefs.c:766
+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
+msgid "_Date header:"
+msgstr "��อมูลส�ว�หัว��อ�_วั��ี�:"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+msgid "Show _original header value"
+msgstr "�ส����อมูลส�ว�หัว�าม_�����ั�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "สวัส�ี���อ�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "��สอ��ัว�หล��ลั��อิ����อ�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "�ลั��อิ����อ���สอ�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "�ลั��อิ���สอ�สำหรั��ัว�หล� EPlugin ���อ�"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "สมุ��ี�อยู�����รื�อ��ี�"
+msgid "Add local address books to Evolution."
+msgstr "��ิ�มสมุ��ี�อยู�����รื�อ����า�� Evolution"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "อ����ระ�อ��ื���า�สำหรั�สมุ��ี�อยู�����รื�อ�"
+msgid "Local Address Books"
+msgstr "สมุ��ี�อยู�����รื�อ��ี�"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16038,199 +15970,212 @@ msgid ""
 "body."
 msgstr "ราย�าร��าะ�ส�ี��ลั��อิ���ือ��าร������ม�ะ���หา����ื�อ�วาม"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "�ำหลั�"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Attachment Reminder"
-msgstr "�ลั��อิ���ือ��าร������ม"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr "�รว���าะ�ส����อ�วาม�ี��ล�าว�ึ����ม��� �ละ��ือ���า�า����ม�����"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr "Evolution �รว����ำ�า��ำ�ี�����ี�ว�า��อ�วาม�ี���า�ะมี���ม��� ����ม���ว�ามี�าร������ม"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "��อ�วาม�า����ม���"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add attachment..."
+msgstr "�_�ิ�ม���ม���..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "�_������อ�วาม"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "�ลั��อิ���ือ��าร������ม"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "��ือ��มื�อ�ุ�ลืม������ม���ั���อ�วาม�มล"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"�ลั��อิ�สำหรั��าร�ั��รีย���อ�วาม �ึ���ส�����ม����ี������สีย�ล����รร�ั� �ละ�ห��ุ��ล���สีย��า� "
-"Evolution ��ย�ร����"
+msgid "Inline Audio"
+msgstr "�สีย�����อ�วาม"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "�ลั��อิ��สีย����รร�ั�"
+msgid "Play audio attachments directly in mail messages."
+msgstr "�ล���สีย��ี����มา����อ�วาม�มล��ย�ร�"
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "�ลือ��ื�อ�อ����มสำรอ���อมูล�อ� Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "�_ริ�ม Evolution �หม�หลั��ารสำรอ�"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "�ลือ����มสำรอ���อมูล�อ� Evolution �ี��ะ�รีย��ื�"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "�_ริ�ม Evolution �หม�หลั��าร�รีย��ื�"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "�ื���ื���ย�����อมูลสำรอ�"
-
-#: ../plugins/backup-restore/backup-restore.c:289
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 "�ุ�สามาร��ื�� Evolution �ื���ย������มสำรอ���อมูล�อ��ุ� ��ย�ะ�ื���ั����อมูล �มล, ��ิ�ิ�, "
-"ภาร�ิ�, �ั��ึ���วย�ำ, สมุ��ี�อยู� \n"
-"�ละยั��ื����า�ั��ส�ว��ัว �ัว�รอ��มล ฯลฯ ��า�� �อ��ุ���วย"
+"ภาร�ิ�, �ั��ึ���วย�ำ, สมุ��ี�อยู� �ละยั��ื����า�ั��ส�ว��ัว �ัว�รอ��มล ฯลฯ ��า�� �อ��ุ���วย"
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_�ื�� Evolution �า����มสำรอ���อมูล"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "�รุ�า�ลือ����ม�ั�������อมูล���า�อ� Evolution �ี��ะ�ื���ื�:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "�ลือ����ม�ี��ะ�ื��"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup-restore.c:315
+msgid "Restore from backup"
+msgstr "�ื���ื���ย�����อมูลสำรอ�"
+
+#: ../plugins/backup-restore/backup-restore.c:353
+msgid "_Backup Settings..."
+msgstr "_สำรอ���า�ั��..."
+
+#: ../plugins/backup-restore/backup-restore.c:355
+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:362
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "�ื����อมูล�ละ��า�ั���อ� Evolution �า����ม�ั�����"
+
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "สำรอ����ร��อรี Evolution"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "�ื�����ร��อรี Evolution"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "�รว�สอ����มสำรอ���อมูล Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "�ริ�ม��ิ� Evolution �หม�"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "���ส�ว��ิ���อ�ู��������รา�ิ�ส�"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "�ำลั��ิ� Evolution"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "�ำลั�สำรอ��ั��ี�ละ��า�ั���อ� Evolution"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "�ำลั�สำรอ���อมูล�อ� Evolution (�มล, �ี�อยู��ิ���อ, ��ิ�ิ�, ภาร�ิ�, �ั��ึ���วย�ำ)"
+msgstr "�ำลั�สำรอ���อมูล�อ� Evolution (�มล, �ู��ิ���อ, ��ิ�ิ�, ภาร�ิ�, �ั��ึ���วย�ำ)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "สำรอ���อมูล�สร��สม�ูร��"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "�ำลั��ริ�ม��ิ� Evolution �หม�"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "สำรอ���อมูล�ั��ุ�ั��อ� Evolution"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "�ำลั�������ม�า����มสำรอ���อมูล"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "�ำลั�อ�า���า�ั���อ� Evolution"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "�ำลั�ล����มสำรอ��ั�ว�ราว"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "�ำลั���รียม�หล������รื�อ�"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:428
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "�ำลั�สำรอ��ว��ี���ล��อร� %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:433
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "�ำลั��ื����ย�����ล��อร� %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Backup"
 msgstr "สำรอ���อมูล Evolution"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Restore"
 msgstr "�ื����อมูล Evolution"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:488
 msgid "Backing up Evolution Data"
 msgstr "�ำลั�สำรอ���อมูล�อ� Evolution"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:489
 msgid "Please wait while Evolution is backing up your data."
 msgstr "��ร�รอสั��รู� Evolution �ำลั�สำรอ���อมูล�อ��ุ�"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:491
 msgid "Restoring Evolution Data"
 msgstr "�ำลั��ื����อมูล Evolution �ื�"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:492
 msgid "Please wait while Evolution is restoring your data."
 msgstr "��ร�รอสั��รู� Evolution �ำลั��ื����อมูล�อ��ุ��ื�"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:510
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "อา�����วลา�า� �ึ��อยู��ั��ริมา���อมูล���ั��ี�อ��ุ�"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "�ลั��อิ�สำหรั�สำรอ��ละ�ื����อมูล�ละ��า�ั���อ� Evolution"
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr "สำรอ��ละ�รีย��ื�"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "�ลั��อิ�สำรอ��ละ�รีย��ื�"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "สำรอ��ละ�ื����อมูล�ละ��า�ั���อ� Evolution �อ��ุ�"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16282,85 +16227,80 @@ msgstr ""
 "�รุ�า�รว�สอ��ห������ว�า�ุ�����ิ�ห��า��า��ี�ยั��ม��ั��ึ��ร�หม��ล�ว��อ��ี��ะ�ำ��ิ��าร��อ�� "
 "��า�ุ���อ��าร�ห��ริ�ม��ิ� Evolution �หม���ยอั���มั�ิหลั��าร�ื����อมูล �รุ�า�า�ี��ล�อ��า"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "สำรอ��ละ�ื����อมูล�ละ��า�ั���อ� Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "_�ื����า�ั��..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "_สำรอ���า�ั��..."
-
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "�ิ���ออั���มั�ิ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "��ิ�มราย�าร��สมุ��ี�อยู���ย_อั���มั�ิ�มื�อ�อ���อ�วาม"
+#: ../plugins/bbdb/bbdb.c:710
+msgid "Create _address book entries when sending mails"
+msgstr "��ิ�มราย�าร��สมุ�_�ี�อยู��มื�อ�อ��มล"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "�ลือ�สมุ��ี�อยู�สำหรั��ี�อยู��ิ���ออั���มั�ิ"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
-msgstr "�ี�อยู��ิ���อสำหรั���อ�วาม�ั���"
+msgstr "�ู��ิ���อสำหรั���อ�วาม�ั���"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "�รั���อมูล�ี�อยู��ิ���อ�ละรู�ภา��ั�ราย�ื�อ�ู�ส���า�อ� Pidgin"
+msgstr "�รั���อมูล�ู��ิ���อ�ละรู�ภา��ั�ราย�ื�อ�ู�ส���า�อ� Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "�ลือ�สมุ��ี�อยู�สำหรั��ู�ส���า�อ� Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "�รั���อมูล�ั�ราย�ื�อ_�ู�ส���า��ี�ยว�ี�"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
 "��ิม�ื�อ�ละ�ี�อยู�อี�มลล���สมุ��ี�อยู���ยอั���มั�ิ��ะ�ี��ุ��อ��มล "
-"รวม�ั����ิม��อมูล�ี�อยู��ิ���อ��อ�วาม�ั����า�ราย�ื�อ�ู�ส���า�อ��ุ���วย"
+"รวม�ั����ิม��อมูล�ู��ิ���อ��อ�วาม�ั����า�ราย�ื�อ�ู�ส���า�อ��ุ���วย"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#, 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:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "��ิ���อ�ิ��ลา���ะสร�า���ร��ส %s: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "��ร��สลู� Bogofilter �ม��อ�ส�อ� �ะ��า�ิ��..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "�าร�อย��ร��สลู� Bogofilter �ู��ั��ั�หวะ �ะ����ร��รม..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "สร�า�������ยั� Bogofilter �ม�สำ�ร�� รหัส��อ�ิ��ลา�: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "��ล�อั��ระ����อ�วาม����_ยู�ิ����"
 
@@ -16377,143 +16317,284 @@ msgstr ""
 "�มล�ยะ�ี����รหัสอั��ระ��า��ั��ห��หมือ��ั�"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "�ัว�ลือ�สำหรั� Bogofilter"
+msgid "Bogofilter Junk Filter"
+msgstr "�ลั��อิ��รอ��ยะ Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "�ลั��อิ��รอ��ยะ Bogofilter"
+msgid "Bogofilter Options"
+msgstr "�ัว�ลือ�สำหรั� Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "�รอ��มล�ยะ��ย��� Bogofilter"
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr "ยื�ยั��ัว�ุ��ล�ม�สำ�ร�� ��ิร���วอร���อ��าร�าร���าระ��อย�า��ู���อ�"
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr "หา URL �ี��ำห���ม���"
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+"��ิร���วอร��ื���อมูล�ี��ม��า�หมาย\n"
+"%d - %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
+
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+msgid "Failed to parse server response."
+msgstr "�ม�สามาร�����ำ�อ��า���ิร���วอร�"
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+msgid "Events"
+msgstr "�ห�ุ�าร��"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+msgid "User's calendars"
+msgstr "��ิ�ิ��อ��ู����"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+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
+msgid "Searching for user's calendars..."
+msgstr "�ำลั����หา��ิ�ิ��อ��ู����..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+msgid "Could not find any user calendar."
+msgstr "�ม�����ิ�ิ����ลย�อ��ู����"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "�วาม�ยายามล�าสุ�ล�ม�หลว: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "�วาม�ยายามล�าสุ�ล�ม�หลว��วยรหัส %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "��อ�รหัส��า�สำหรั��ู���� <b>%s</b> �ี���ิร���วอร� <b>%s</b>"
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr "�ม�สามาร�สร�า���อ�วาม soup สำหรั� URL '%s'"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+msgid "Searching folder content..."
+msgstr "�ำลั������ื�อหา��ล��อร�..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+msgid "List of available calendars:"
+msgstr "ราย�ื�อ��ิ�ิ��ี�มี:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+msgid "Supports"
+msgstr "รอ�รั�"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr "�ม�สามาร�สร�า���ร�: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "URL '%s' �อ���ิร���วอร� �ม���� URL �ี��ู���อ�"
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr "�รีย��ู��ื�อหา��ิ�ิ� CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "��� _SSL"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../plugins/caldav/caldav-source.c:228
+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
 msgid "Re_fresh:"
 msgstr "�_หล��หม�:"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "�หล����ิ�ิ� CalDAV"
+msgid "Add CalDAV support to Evolution."
+msgstr "��ิ�ม�ารรอ�รั� CalDAV �ห��ั� Evolution"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "�หล�� CalDAV"
+msgid "CalDAV Support"
+msgstr "�ารรอ�รั� CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:112
+msgid "_Customize options"
+msgstr "_�รั��ัว�ลือ�"
+
+#: ../plugins/calendar-file/calendar-file.c:131
+msgid "File _name:"
+msgstr "_�ื�อ���ม:"
+
+#: ../plugins/calendar-file/calendar-file.c:135
+msgid "Choose calendar file"
+msgstr "�ลือ����ม��ิ�ิ�"
+
+#: ../plugins/calendar-file/calendar-file.c:183
+msgid "On open"
+msgstr "��ะ��ิ�"
+
+#: ../plugins/calendar-file/calendar-file.c:184
+msgid "On file change"
+msgstr "�มื�อ���ม��ลี�ย���ล�"
+
+#: ../plugins/calendar-file/calendar-file.c:185
+msgid "Periodically"
+msgstr "����ระยะ"
+
+#: ../plugins/calendar-file/calendar-file.c:200
+msgid "Force read _only"
+msgstr "�ั��ั���ิ����_อ�า�อย�า���ียว"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "��ิ�ิ���อ��ิ��"
+msgid "Add local calendars to Evolution."
+msgstr "��ิ�ม��ิ�ิ�����รื�อ����า�� Evolution"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ���อ��ิ��"
+msgid "Local Calendars"
+msgstr "��ิ�ิ�����รื�อ�"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "�_���าร��ื�อม��อ����ิรภัย"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "_�ื�อ�ู����:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "��ิ�ิ� HTTP"
+msgid "Add web calendars to Evolution."
+msgstr "��ิ�ม��ิ�ิ��ว�����า�� Evolution"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ� webcal �ละ http"
+msgid "Web Calendars"
+msgstr "��ิ�ิ��ว��"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "สภา�อา�าศ: หมอ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "สภา�อา�าศ: ��อ���ามี�ม�����ส�ว�มา�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "สภา�อา�าศ: �ื���อ���ามี�ม�����ส�ว�มา�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "สภา�อา�าศ: �ม����ม��อ���า"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "สภา�อา�าศ: ���ู�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "สภา�อา�าศ: หิมะ��"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "สภา�อา�าศ: ��อ���า���ม�ส"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "สภา�อา�าศ: �ื���อ���า���ม�ส"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "สภา�อา�าศ: �ายุ��า�ะ�อ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "�ลือ�ส�า��ี�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "_ห��วย:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "�ม�ริ� (��ล��ียส, �.ม. ฯลฯ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "อั��ฤษ (�า�ร��ฮ��, �ิ�ว ฯลฯ)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ�สภา�อา�าศ"
+msgid "Add weather calendars to Evolution."
+msgstr "��ิ�ม��ิ�ิ�สภา�อา�าศ���า�� Evolution"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "��ิ�ิ�สภา�อา�าศ"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr "�ลั��อิ���สอ� �ึ��สา�ิ��ลั��อิ�����ุ��ม�ู �ห��ุ��ั�ลอ�สิ����า�� ล��ลิ��อร��"
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+msgid "Contacts map"
+msgstr "����ี��ู��ิ���อ"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "��รื�อ�มือ�ั�ลอ�"
+#: ../plugins/contacts-map/contacts-map.c:56
+msgid "Show a map of all the contacts"
+msgstr "�ส������ี��อ��ู��ิ���อ�ั��หม�"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr "��ิ�ม����ี��ส���ำ�ห����ี��ั���อ��ู��ิ���อ�มื�อ���������"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+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"
@@ -16526,35 +16607,34 @@ msgstr ""
 "�ุ��รั���ี� Evolution �ริ�ม�ำ�า� �รว�สอ�ว�า Evolution ������ร��รมอ�า�-��ีย��มล�ริยายหรือ�ม�"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+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 "
+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-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "�ำ��รื�อ�หมาย����สมุ��ี�อยู�_�ริยาย"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:88
+msgid "A_utocomplete with this address book"
+msgstr "�_�ิม���มอั���มั�ิ��วยสมุ��ี�อยู��ี�"
+
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "�ำ��รื�อ�หมาย������ิ�ิ�_�ริยาย"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "�ำ��รื�อ�หมาย����ราย�ารภาร�ิ�_�ริยาย"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "�ำ��รื�อ�หมาย����ราย�าร�ั��ึ���วย�ำ_�ริยาย"
 
@@ -16563,46 +16643,57 @@ msgid "Default Sources"
 msgstr "�หล���ริยาย"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr "�ำ��รื�อ�หมายสมุ��ี�อยู��ละ��ิ�ิ��ี��ุ��ลือ��ห������หล���ี������ย�ริยาย"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "ราย�ื�อ��อมูลส�ว�หัว�ำห���อ�"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr "อ����ระ�อ��ื���า�สำหรั��ลือ��ำห����ิ�ิ�หรือสมุ��ี�อยู�����ราย�าร�ริยาย"
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"ระ�ุราย�ื�อ��อมูลส�ว�หัว�ำห���อ� �ึ���ุ�สามาร���ิ�ม���า����อ�วาม�าออ���� สำหรั����ละราย�าร "
+"รู�����อ��าร�ำห����อมูลส�ว�หัว�ละ��า�อ���อมูล�ือ: �ื�อ��อมูลส�ว�หัว �าม��วย \"=\" "
+"�ละ��า�อ���อมูล �ั�����ละราย�าร��วย \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "�ารรั�ษา�วาม�ลอ�ภัย:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "�ม�มีหมว�หมู�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "���ิ�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "ลั�มา�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "ลั��ี�สุ�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "��อมูลส�ว�หัว_�ำห���อ�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
-msgid "Key"
-msgstr "�ีย�"
-
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
-msgid "Values"
-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.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16610,987 +16701,97 @@ msgstr ""
 "รู�����าร�ำห����า��อมูลส�ว�หัว�ือ:\n"
 "�ื�อ�อ���า��อมูลส�ว�หัว �ั����วย \";\""
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "��อมูลส�ว�หัว�ำห���อ�สำหรั�อี�มล"
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "�ีย�"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "��า"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "��ิ�ม��อมูลส�ว�หัว�ำห���อ�����อ�วาม�าออ�"
+msgid "Add custom headers to outgoing mail messages."
+msgstr "��ิ�ม��อมูลส�ว�หัว�ำห���อ����มล�าออ�"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
 msgstr "��อมูลส�ว�หัว�ำห���อ�"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "ราย�ื�อ��อมูลส�ว�หัว�ำห���อ�"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"ระ�ุราย�ื�อ��อมูลส�ว�หัว�ำห���อ� �ึ���ุ�สามาร���ิ�ม���า����อ�วาม�าออ���� สำหรั����ละราย�าร "
-"รู�����อ��าร�ำห����อมูลส�ว�หัว�ละ��า�อ���อมูล�ือ: �ื�อ��อมูลส�ว�หัว �าม��วย \"=\" "
-"�ละ��า�อ���อมูล �ั�����ละราย�าร��วย \";\""
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "��ิ���ล��อร�อื���อ��ู����"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_�ื�อ�ั��ี:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "�ื�อ�_�ล��อร�:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "_�ื�อ�ู����:"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "รหัส��า��ิรภัย"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"�ัว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร� Exchange ��ย����ารยื�ยั��ัว����วยรหัส��า��ิรภัย (NTLM)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "รหัส��า���อ�วาม��ล�า"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"�ัว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร� Exchange ��ย����ารยื�ยั��ัว����วยรหัส��า���อ�วาม��ล�า"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-msgid "Out Of Office"
-msgstr "�ม�อยู��ี��ำ�า�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"��อ�วาม�ี�ระ�ุ��า�ล�า��ี��ะ�ู�ส��อั���มั�ิ \n"
-"��ยั����ละ���ี�ส���มล�ึ��ุ� ����ะ�ี��ุ��ม�อยู��ี�สำ�ั��า�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
-msgid "I am out of the office"
-msgstr "�ั��ม�อยู��ี�สำ�ั��า�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am in the office"
-msgstr "�ั�อยู��ี�สำ�ั��า�"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
-msgid "Change the password for Exchange account"
-msgstr "��ลี�ย�รหัส��า�สำหรั��ั��ี Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "��ลี�ย�รหัส��า�"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
-msgid "Manage the delegate settings for Exchange account"
-msgstr "�ั��าร��า�ั���อ��ารมอ��ั��ะสำหรั��ั��ี Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
-msgid "Delegation Assistant"
-msgstr "��รื�อ�มือ��วยมอ��ั��ะ"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
-msgid "Miscelleneous"
-msgstr "������ล��"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
-msgid "View the size of all Exchange folders"
-msgstr "�ู��า��อ���ล��อร�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
-msgid "Folders Size"
-msgstr "��า��อ���ล��อร�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "��า�ั�� Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
-msgid "_OWA URL:"
-msgstr "_OWA URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
-msgid "A_uthenticate"
-msgstr "ยื_�ยั��ัว�ุ��ล"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "_ระ�ุ�ื�อ�ล�อ��มล"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
-msgid "_Mailbox:"
-msgstr "�ล�อ��_มล:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
-msgid "_Authentication Type"
-msgstr "��ิ��อ��าร_ยื�ยั��ัว�ุ��ล"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "_�รว�สอ���ิ��ี�รอ�รั�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution อยู����หม�ออ��ล�� �ุ��ม�สามาร�สร�า�หรือ��ลี�ย���ล���ล��อร��������ะ�ี�\n"
-"�รุ�า��ลี�ย����าสู��หม�ออ��ล����ื�อ�ำ��ิ�ั�ิ�าร�ั��ล�าว"
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr "รหัส��า��ั��ุ�ั��ม��ร��ั�รหัส��า��อ��ั��ี�ุ� �รุ�า��อ�รหัส��า��ี��ู���อ�"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "รหัส��า��ั��สอ�อั��ม��ร��ั� �รุ�า��อ�รหัส��า��หม�"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "ยื�ยั�รหัส��า�:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "รหัส��า��ั��ุ�ั�:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "รหัส��า��หม�:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "รหัส��า��อ��ุ����หม�อายุล��ล�ว �รุ�า��ลี�ย�รหัส��า��ั��ี"
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "รหัส��า��อ��ุ��ะหม�อายุล���อี� %d วั�"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
-msgid "Custom"
-msgstr "�ำห���อ�"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "�รร�า�ิ�าร (อ�า�, สร�า�, �����)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "�ู���ีย� (อ�า�, สร�า�)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "�ู��รว��า� (อ�า�อย�า���ียว)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegate Permissions"
-msgstr "สิ��ิ��อ��ู�รั�มอ��ั��ะ"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
-#, c-format
-msgid "Permissions for %s"
-msgstr "�าร�ำห��สิ��ิ�สำหรั� %s"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"��อ�วาม�ี��ู�ส����ยอั���มั�ิ�า� Evolution ��ื�อ�����ห��ุ��รา�ว�า�ุ����รั��ารมอ��ั��ะ�ล�ว ��อ���ี� "
-"�ุ�สามาร�ส����อ�วาม���าม�อ���า����า���"
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
-msgid "You have been given the following permissions on my folders:"
-msgstr "�ุ����รั�อ�ุ�า��ห��ระ�ำ�าร��อ���ี�����ล��อร��อ���า����า:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
-msgid "You are also permitted to see my private items."
-msgstr "�ุ����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ���า����า�����วย"
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
-msgid "However you are not permitted to see my private items."
-msgstr "����ุ��ม����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ���า����า"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "�ุ����รั��ารมอ��ั��ะ�ห������ัว����อ� %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:417
-msgid "Delegate To"
-msgstr "มอ��ั��ะ�ห��ั�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:582
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "ล��ารมอ��ั��ะ�ห��ั� %s หรือ�ม�?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:700
-msgid "Could not access Active Directory"
-msgstr "�ม�สามาร����า��� Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:712
-msgid "Could not find self in Active Directory"
-msgstr "�ม����ัว�ู������ Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:725
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "�ม����ู�รั�มอ��ั��ะ %s �� Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:737
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "�ม�สามาร�ล��ู�รั�มอ��ั��ะ %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:797
-msgid "Could not update list of delegates."
-msgstr "�ม�สามาร��รั���อมูลราย�ื�อ�ู�รั�มอ��ั��ะ"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:815
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "�ม�สามาร���ิ�ม�ู�รั�มอ��ั��ะ %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:983
-msgid "Error reading delegates list."
-msgstr "��ิ���อ�ิ��ลา���ะอ�า�ราย�ื�อ�ู�รั�มอ��ั��ะ"
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
-msgid "C_alendar:"
-msgstr "_��ิ�ิ�:"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Co_ntacts:"
-msgstr "_�ี�อยู��ิ���อ:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid "Delegates"
-msgstr "�ู�รั�มอ��ั��ะ"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
-msgid "Permissions for"
-msgstr "�าร�ำห��สิ��ิ�สำหรั�"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"�ู�����หล�า�ี��ะสามาร�ส���มล���าม�อ��ุ����\n"
-"�ละสามาร����า�ึ���ล��อร��อ��ุ���วยสิ��ิ��ี��ุ��ำห��"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "�ู�รั�มอ��ั��ะสามาร��ูราย�าร_ส�ว��ัว���"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "��หมาย�_��า:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "_สรุ��ารอ�ุ�า�สิ��ิ�"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-msgid "_Tasks:"
-msgstr "_ภาร�ิ�:"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "�าร�ำห��สิ��ิ�"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "�ื�อ��ล��อร�"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "��า��อ���ล��อร�"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
-msgid "User"
-msgstr "�ู����"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "�อ�รั���อมูล�า���ล��อร��ู����อื��"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "ลำ�ั��ั����ล��อร� Exchange"
-
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
-msgid "Unsubscribe Folder..."
-msgstr "�ลิ��อ�รั���อมูล��ล��อร�..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "�ลิ��อ�รั���อมูล�า���ล��อร� \"%s\" �ริ�หรือ�ม�?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "�ลิ��อ�รั���อมูล�า� \"%s\""
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>�อ��ี�ส�า�ะ�อ��ุ��ือ \"�ม�อยู��ี�สำ�ั��า�\". </b>\n"
-"\n"
-"�ุ���อ��าร��ลี�ย�ส�า�ะ���� \"อยู���สำ�ั��า�\" หรือ�ม�? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>��อ�วาม�มื�อ�ม�อยู�สำ�ั��า�:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>ส�า�ะ:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>��หมาย�ี�ระ�ุ��า�ล�า��ี��ะส��อั���มั�ิ��ยั��ู��ี�ส��\n"
-"�มล�ึ��ุ���ะ�ี��ุ��ม�อยู�สำ�ั��า�</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "��ะ�ี��ั�อยู�สำ�ั��า�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "��ะ�ี��ั��ม�อยู��ี�สำ�ั��า�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "�ม� �ม���อ���ลี�ย�ส�า�ะ"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "�ู���วย�ั��ารส�า�ะ�ม�อยู��ี��ำ�า�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "��ล���ลี�ย�ส�า�ะ"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "�ำ��ือ�รหัส��า�หม�อายุ...."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "รหัส��า��อ��ุ��ะหม�อายุล���อี� 7 วั�..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "�_�ลี�ย�รหัส��า�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
-msgid "(Permission denied.)"
-msgstr "(�ม����รั�อ�ุ�า�)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-msgid "Add User:"
-msgstr "��ิ�ม�ู����:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
-msgid "Add User"
-msgstr "��ิ�ม�ู����"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>�าร�ำห��สิ��ิ�</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "ห�ามล�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "ห�าม�����"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "สร�า�ราย�าร"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "สร�า���ล��อร�ย�อย"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "ล�ราย�าร���"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "ล�ราย�าร�อ����อ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "�����ราย�าร���"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "�����ราย�าร�อ����อ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "�ี�อยู��ิ���อ����ล��อร�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "���า�อ���ล��อร�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "มอ��ห����ล��อร�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "อ�า�ราย�าร"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "���า�: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>��า�ั���อ���อ�วาม</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>�ัว�ลือ��าร�ิ��าม</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange - �ัว�ลือ��อ��ารส��"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "ระ�ั��วาม_สำ�ั�: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"���ิ\n"
-"สู�\n"
-"��ำ"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"���ิ\n"
-"ส�ว��ัว\n"
-"ส�ว�\n"
-"ลั�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "ร�อ��อ�าร����_รั�สำหรั���อ�วาม�ี�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "ร�อ��อ�าร����_อ�า�สำหรั���อ�วาม�ี�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "ส�����าม�ู�รั�มอ��ั��ะ"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "ระ�ั��วาม_���ิ�:"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "�ู��_��"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
-msgid "Select User"
-msgstr "�ลือ��ู����"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
-msgid "Address Book..."
-msgstr "สมุ��ี�อยู�..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "�อ�รั���อมูล�ี�อยู��ิ���อ�อ��ู����อื��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "�อ�รั���อมูล��ิ�ิ��อ��ู����อื��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr "�ลั��อิ��ั��าร��ิ�ั�ิ�าร�ละ�ุ�ลั�ษ�ะ��า�� �ี�������าะ�ั��ั��ี Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "��ิ�ั�ิ�าร��ี�ยว�ั� Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr "�ม�สามาร����า������� \"��า�ั�� Exchange\" ��ะ�ำ�า����ออ��ล�����"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "�ม�สามาร���ลี�ย�รหัส��า���ื�อ��า��ั�หา��ี�ยว�ั��าร�ั����า"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "�ม�สามาร��ส����ล��อร�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "�ม�สามาร��ระ�ำ��ิ�ั�ิ�าร���"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"�าร��ลี�ย���ล���า�ั�����ั��ี Exchange \"{0}\" �ะมี�ลหลั��า��ี� Evolution "
-"�ริ�ม�ำ�า��หม����า�ั��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "�ม�สามาร�ยื�ยั��ัว�ุ��ล�ั���ิร���วอร�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "�ม�สามาร���ลี�ย�รหัส��า�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"�ม�สามาร��ั����า�ั��ี Exchange ��ราะ��ิ���อ�ิ��ลา�\n"
-"�ม��รา�สา�ห�ุ �รุ�า�รว�สอ� URL, �ื�อ�ู���� \n"
-"�ละรหัส��า� �ล�วลอ��หม�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "�ม�สามาร��ิ�าร�าสิ��ิ�����ล��อร��อ��ู�รั�มอ��ั��ะ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "�ม���ระ���หล���������ว���อ� Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "หา�ำ�ห�����ิร���วอร� {0} �ม���"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "�ม�สามาร�มอ��ั��ะ�ห��ั� {0} ���"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "�ม�สามาร�อ�า���า�าร�ำห��สิ��ิ��อ���ล��อร�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "�ม�สามาร�อ�า���า�าร�ำห��สิ��ิ��อ���ล��อร�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "�ม�สามาร�อ�า�ส�า�ะ�าร�ม�อยู��ี��ำ�า�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "�ม�สามาร��รั���อมูล�าร�ำห��สิ��ิ��อ���ล��อร�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "�ม�สามาร��รั���อมูลส�า�ะ�าร�ม�อยู��ี��ำ�า�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "Evolution ��อ��ริ�ม�ำ�า��หม���ื�อ�ะ�หล��ล�อ��มล�อ��ู�����ี��อ�รั���อมูล�ว�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "�ั��ี Exchange �ำ�า�ออ��ล��อยู�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"�ลั��อิ���ื�อม��อ Exchange ��อ��าร����วามสามาร��า�อย�า�\n"
-"�อ���ิร���วอร� Exchange �ึ���ู��ิ�หรือห�าม���อยู� (มั��ะ��ย\n"
-"�ม�����า) �ู��ู�ล Exchange �อ��ุ��ำ������อ���ิ��วามสามาร��ี�\n"
-"��ื�อ�ี��ุ��ะสามาร�����ลั��อิ���ื�อม��อ Exchange �อ� Evolution ���\n"
-"\n"
-"สำหรั���อมูล�ี��ะ�อ��ั��ู��ู�ล Exchange �อ��ุ� �รุ�า�ู�ี�ลิ�����า�ล�า��ี�:\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "�ม�สามาร��รั���อมูล�ารมอ��ั��ะ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "มี��ล��อร�อยู��ล�ว"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "�ม�มี��ล��อร��ี�อ�า�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "��ล��อร�ออ��ล��อยู�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
-msgid "Generic error"
-msgstr "��อ�ิ��ลา��ั�ว��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "�ิ���อ��ิร���วอร� Global Catalog �ม����"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr "��า OWA �ำลั��ำ�า����า�อื�� �ุ���อ�ระ�ุ�า��ั��ล�าว���ล�อ�����อ��ั����า�ั��ี"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "�ล�อ��มลสำหรั� {0} �ม�อยู�����ิร���วอร��ี�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "�รุ�า�รว�สอ��ห������ว�า URL �ู���อ� �ล�วลอ��หม�อี��รั��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "�รุ�า�รว�สอ��ห������ว�า�ุ�สะ���ื�อ��ิร���วอร��ู���อ� �ล�วลอ��หม�อี��รั��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "�รุ�า�รว�สอ��ห������ว�า�ื�อ�ู�����ละรหัส��า��ู���อ� �ล�วลอ��หม�อี��รั��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "�ม�����ั����า��ิร���วอร� Global Catalog สำหรั��ั��ี�ี��ว�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "�ม�มี�ล�อ��มลสำหรั��ู���� {0} �ี� {1}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "�ม�มี�ู���� {0} �ี�อ�า�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "��ลี�ย�รหัส��า�สำ�ร���ล�ว"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "�รุ�า��อ��ื�อ�อ��ู�รั�มอ��ั��ะ หรือย��ลิ��ัว�ลือ��ารส�����าม�ู�รั�มอ��ั��ะ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "�รุ�า�รว��ู�ห������ว�า�ื�อ��ิร���วอร� Global Catalog �ู���อ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "�รุ�า�ริ�ม Evolution �หม� ��ื�อ�ห��าร��ลี�ย���ล�มี�ล"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "�รุ�า�ลือ��ู����"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "��ิร���วอร���ิ�ส�รหัส��า���ราะ��า��าย��ิ���"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "�ั��ี Exchange �ะ�ู��ิ��มื�อ�ุ�ออ��า� Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "�ั��ี Exchange �ะ�ู�ล��มื�อ�ุ�ออ��า� Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "��ิร���วอร� Exchange ���า�ั��ม�����ั��ลั��อิ���ื�อม��อ Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"��ิร���วอร���� Exchange 5.5 ����ะ�ี��ลั��อิ���ื�อม��อ Exchange \n"
-"รอ�รั� Microsoft Exchange 2000 �ละ 2003 ���า�ั��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"��อ�ิ��ลา��ี� อา�หมาย�วามว�า ��ิร���วอร��อ��ุ���อ��าร�ห��ุ� \n"
-"ระ�ุ�ื�อ���ม�วิ���วส����ื�อ�ู�����อ��ุ���วย (���� &quot;DOMAIN\\user&quot;)\n"
-"\n"
-"หรือ�ุ�อา������อ�รหัส��า��ิ����า�ั���อ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "�รุ�าลอ��ั��รหัส��า��หม�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "�ม�สามาร���ิ�ม�ู������ราย�าร�ว��ุม�าร���า�ึ�:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "�ม�สามาร�������ารมอ��ั��ะ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ��ะ��ิ�หา {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
-msgid "Unknown error."
-msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "��ิ��ม�รู��ั�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "�ู����ย��ลิ���ิ�ั�ิ�าร"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "�ุ������ว�าสำหรั������มล����ิร���วอร��ี���ล��ะ���ม�ล�ว"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "�ุ�สามาร�ส����อ�วาม���าม�อ��ู�มอ��ั��ะ�����ีย��ีละห�ึ�������า�ั��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "�ุ��ม�สามาร�มอ��ั��ะ�าร�ระ�ุม�ห��ัว�อ����"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "�ุ���������ื�อ�ี������มล����ิร���วอร��ี���ิ���ว�า�ี��ำห���ล�ว"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "�ุ��ำห����า�ั��ี Exchange �����ีย��ั��ี��ียว���า�ั��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr "�าร����า��อ��ุ���ะ�ี��ือ: {0} KB  �รุ�า��ลียร���ื�อ�ี���ยล��มล�า�ส�ว�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr "�าร����า��อ��ุ���ะ�ี��ือ: {0} KB  �ุ��ะ�ม�สามาร�รั�หรือส���มล���"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"�าร����า��อ��ุ���ะ�ี��ือ: {0} KB  �ุ��ะ�ม�สามาร�ส���มล��� "
-"���ว�า�ะ��ลียร���ื�อ�ี���ยล��มล�า�ส�ว�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "รหัส��า��อ��ุ�หม�อายุ�ล�ว"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "�ม�สามาร���ิ�ม {0} ล���ราย�าร�ว��ุม�าร���า�ึ����"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} �����ู�รั�มอ��ั��ะ�ระ�ุมอยู��ล�ว"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} อยู���ราย�ื�ออยู��ล�ว"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "��อมูลส�ว�หัว�ำห���อ�สำหรั�อี�มล"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "�อ�รั���อมูลภาร�ิ��อ��ู����อื��"
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "��ิ���รื�อ�มือ�������ยอั���มั�ิ�มื�อมี�าร���ุ�ม�����ิม����ห��า��า���ีย��มล"
 
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "�รว�สอ��าร�ำห��สิ��ิ��อ���ล��อร�"
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:119
+msgid "Automatically launch when a new mail is edited"
+msgstr "��ิ���รื�อ�มือ�������ยอั���มั�ิ�มื�อมี�าร������มล�หม�"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "��รื�อ�มือ�������อ�วามภาย�อ��ริยาย"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "�ำสั���ริยาย�ี��ะ���������รื�อ�มือ�������อ�วาม"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "�ำสั���ี��ะ�ำ�า���ื�อ�รีย���รื�อ�มือ�����:"
+
+#: ../plugins/external-editor/external-editor.c:109
 msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
 msgstr ""
-"�ลั��อิ�สำหรั������รื�อ�มือ�������อ�วามภาย�อ�สำหรั���ีย���อ�วาม "
-"�ุ��ะสามาร�ส����อ�วาม�����อ�วามล�ว�������า�ั��"
+"สำหรั� Emacs ��� \"xemacs\"\n"
+"สำหรั� VI ��� \"gvim -f\""
 
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "��ีย���อ�วาม��วย��รื�อ�มือ�����ภาย�อ�"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "��รื�อ�มือ�������อ�วามภาย�อ�"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "�����รื�อ�มือ�������อ�วามภาย�อ�สำหรั���ีย��มล�ี�������อ�วาม��ล�า"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "�ม�สามาร�สร�า����ม�ั�ว�ราว"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "�ม�สามาร��รีย���รื�อ�มือ��������"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr "Evolution �ม�สามาร�สร�า����ม�ั�ว�ราว��ื�อ�ั��ึ��มล�อ��ุ���� �รุ�าลอ��หม�ภายหลั�"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "มี��รื�อ�มือ�������อ�วามภาย�อ��ำลั��ำ�า�อยู�"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"มี��รื�อ�มือ�����ภาย�อ��ำลั��ำ�า�อยู� "
+"�ม�สามาร��ิ�ห��า��า���ีย��มล����รา����ี�ยั�มี��รื�อ�มือ������ำ�า�อยู�"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17598,71 +16799,82 @@ msgstr ""
 "��รื�อ�มือ�������อ�วามภาย�อ��ี��ำห���ว�����า�รั������ลั��อิ��ม�สามาร��รีย��ำ�า���� "
 "�รุ�าลอ��ั��������รื�อ�มือ�����อื��"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "��ีย���อ�วาม��วย��รื�อ�มือ�����ภาย_�อ�"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "��ีย���อ�วาม��ย�����รื�อ�มือ��ีย���อ�วามภาย�อ�"
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "��ร�รู���าย��ย�ริยาย"
 
-#: ../plugins/external-editor/external-editor.c:114
-msgid "Command to be executed to launch the editor: "
-msgstr "�ำสั���ี��ะ�ำ�า���ื�อ�รีย���รื�อ�มือ�����:"
-
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"สำหรั� Emacs ��� \"xemacs\"\n"
-"สำหรั� VI ��� \"gvim\""
+"�ำห��ว�า�ะ��ร�รู���าย����อ�วาม�าออ���ย�ริยายหรือ�ม� �วร�ำห��รู���าย��อ���ิ��ัว�ลือ��ี� "
+"มิ�ะ�ั�� ���ะ�ม�มี�ลอะ�ร"
+
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+msgstr "�ลือ�รู� png (�ี�ี�สุ��ือ��า� 48x48 �ุ� �ี��ห���ม���ิ� 720 ����)"
+
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "���มรู�ภา�"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
-msgstr "�ลือ�รู� png ��า� 48x48 �ุ� �ี��ห���ม���ิ� 700 ����"
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr "�_�ร�รู���าย��ย�ริยาย"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "���ม PNG"
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr "�หล�รู�_��ายรู��หม�"
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "รู�_��าย"
+#: ../plugins/face/face.c:415
+msgid "Include _Face"
+msgstr "��ิมรู�_��าย"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
-msgstr ""
-"���รู���าย��ส�ว�หัว�อ���อ�วาม�ี�ส��ออ� ���รั���ร� �ุ��ะ��อ��ำห��รู� png ��า� 48x48 "
-"�ุ��สีย��อ� รู��ี��ะ�ู�������รู���� base64 �����ม ~/.evolution/faces "
-"�ละ�ะ�ู��������อ�วาม�ี�ส��ออ��รั����อ� ��"
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "���รู���าย�ล��� �อ��ุ�����อ�วาม�าออ�"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "�ำลั��ลิ��อ�รั���อมูล�า���ล��อร� \"%s\""
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "อ�า��ม�สำ�ร��"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "��วยย��ลิ��าร�อ�รั���อมูล��ล��อร��มล��า��ม�ู�ลิ��วา�ี������า�"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "��า�รู�ภา��ม��ู���อ�"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe Folders"
-msgstr "�ลิ��อ�รั���อมูล��ล��อร�"
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "�ม����รู�ภา�"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "�_ลิ��อ�รั�"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "�รุ�า�ลือ�รู�ภา���า� 48 x 48"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "�ม�สามาร�อ�า����ม���"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+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: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
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "��อ�รหัส��า�สำหรั��ู���� %s ��ื�อ���า�ึ�ราย�าร��ิ�ิ��ี��อ�รั��ว�"
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17671,45 +16883,66 @@ msgstr ""
 "�ม�สามาร�อ�า���อมูล�า���ิิร���วอร��อ��ู��ิล\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../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
+msgid "Unknown error."
+msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ"
+
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "_��ิ�ิ�:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "�ึ�_ราย�าร"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "�ู��ิล"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
-msgid "<b>Server</b>"
-msgstr "<b>��ิร���วอร�</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "�ลั��อิ��ั����า��ิ�ิ��ละ�ี�อยู��ิ���อ�ู��ิล"
+msgid "Add Google Calendars to Evolution."
+msgstr "��ิ�ม��ิ�ิ��ู��ิล���า�� Evolution"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "�หล���ู��ิล"
+msgid "Google Calendars"
+msgstr "��ิ�ิ��ู��ิล"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "ราย�าร�รว�สอ�"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "�ลั��อิ��ั����า��ิ�ิ��ละ�หล���ี�อยู��ิ���อ�อ� GroupWise"
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "��ล��อร��_��ร�วมอั��หม�..."
+
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "ล��ั��ึ����า������า�ะ_�ัว���..."
+
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "�ั����า�มล�ยะ..."
+
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "�ิ��ามส�า�ะ��อ�วาม..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "�อ��มล�ลั�"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "�าร�ั����า�ั��ี GroupWise"
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "อา��อ�รั�"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "ส�_��าร�ระ�ุม��ำ..."
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
+msgid "Create folder"
+msgstr "สร�า���ล��อร�"
+
+#: ../plugins/groupwise-features/install-shared.c:225
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17720,7 +16953,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "�ู���� '%s' �����ิ���ล��อร��ห��ุ����ร�วม��วย\n"
@@ -17731,267 +16964,274 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"�ลิ� '�ั���' ��ื�อ�ิ��ั����ล��อร��ี����ร�วม\n"
+"�ลิ� '�ริ�ม���' ��ื�อ�ิ��ั����ล��อร��ี����ร�วม\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "�ิ��ั����ล��อร����ร�วม"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "�าร�ิ��ั����ล��อร����ร�วม"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "�ั����า�มล�ยะ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "�ั����า�มล�ยะ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "�ั����า�มล�ยะ..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>ราย�าร�มล�ยะ:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "อี�มล:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+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.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_��ิ�����า�"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "ราย�าร�มล_�ยะ"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "_ล�"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "�อ���อ�วาม�ลั�"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 "�าร�อ���อ�วาม�ลั�อา������ารล���อ�วาม�า��ล�อ��มล�อ��ู�รั� �ุ������หรือ�ม�ว�า�ะ�ำ�����ั��?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "�อ���อ�วาม�ลั�สำ�ร���ล�ว"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
-msgid "Retract Mail"
-msgstr "�อ��มล�ลั�"
+#: ../plugins/groupwise-features/mail-send-options.c:202
+msgid "Insert Send options"
+msgstr "��ร��ัว�ลือ��อ��ารส��"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "��ิ�ม�ัว�ลือ��ารส������อ�วาม GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "�ลั��อิ�สำหรั��าร����า��ั��ี GroupWise"
+msgid "Fine-tune your GroupWise accounts."
+msgstr "�รั������ั��ี GroupWise �อ��ุ�"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "�าร����า� GroupWise"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "�อ���อ�วาม�ลั��ม�สำ�ร��"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "��ิร���วอร��ม�อ�ุ�า��ห��อ���อ�วาม�ี��ลือ��ื�"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "มี�ั��ี &quot;{0}&quot; อยู��ล�ว �รุ�า�รว�สอ���ร�สร�า���ล��อร��อ��ุ�"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "�ั��ีมีอยู��ล�ว"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "�ู�����ม��ู���อ�"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr "ล��ื�อ���า����ร�อ��ี���าม &quot;{0]&quot; �ม�สำ�ร�� �รุ�า�รว�สอ��ี�อยู�อี�มล�อ��ุ�"
+
 #. 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/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "�ม�สามาร��ห��ู���� &quot;{0}&quot; ���า����า����า�ะ�ัว������"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 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/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 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/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "�ุ���อ�ระ�ุ�ื�อ�ู�����ี��������ริ� ��ื�อ�ะ�ห�สิ��ิ��าร�����ัว���"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "มี�ั��ี &quot;{0}&quot; อยู��ล�ว �รุ�า�รว�สอ���ร�สร�า���ล��อร��อ��ุ�"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "�ุ��ม�สามาร���ิ���ล��อร��ี��ห��ู���� &quot;{0}&quot; ���ร�วม"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "�ั��ีมีอยู��ล�ว"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "�ุ���อ�ระ�ุ�ื�อ�ู�����ี��ุ���อ��าร��ิ�ม���า��ราย�ื�อ"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr "ล��ื�อ���า����ร�อ��ี���าม &quot;{0]&quot; �ม�สำ�ร�� �รุ�า�รว�สอ��ี�อยู�อี�มล�อ��ุ�"
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting?"
+msgstr "�ุ���อ��ารส���าร�ระ�ุม�ี���ำหรือ�ม�?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting?"
+msgstr "�ุ���อ��ารส���าร�ระ�ุม����วีย���ำ�ี���ำหรือ�ม�?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item?"
+msgstr "�ุ���อ��าร�อ�ราย�าร�����ั��ลั�หรือ�ม�?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "ราย�าร�����ั��ะ�ู�ล�ออ��า��ล�อ���หมาย�อ��ู�รั�"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "�ี������าร�ระ�ุม�ี�มี�าร�วีย���ำ"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "�ะสร�า��าร�ระ�ุมราย�าร�หม���ย���รายละ�อีย��อ��าร�ระ�ุม��ิม�ี�มีอยู�"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"�ะสร�า��าร�ระ�ุมราย�าร�หม���ย���รายละ�อีย��อ��าร�ระ�ุม��ิม�ี�มีอยู� "
+"�ุ���อ���อ���อ�ำห���าร�วีย���ำ�หม�"
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "�ุ��ะรั�หรือ�ม�?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "�ุ��ะ��ิ�ส�หรือ�ม�?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "�ุ��ม�สามาร���ิ���ล��อร��ี��ห��ู���� &quot;{0}&quot; ���ร�วม"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "�ุ���อ�ระ�ุ�ื�อ�ู�����ี��ุ���อ��าร��ิ�ม���า��ราย�ื�อ"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
-msgid "Accept Tentatively"
-msgstr "อา��อ�รั�"
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>�ู����:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_�ำห����อ�วาม�����ห�ุ"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "�ี�อยู�_�ิ���อ..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
-msgid "Message"
-msgstr "��อ�วาม"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "�าร�����ห�ุ��ล��อร����ร�วม"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "�ู����าร�วม�ะ���รั��าร�����ห�ุ�ั��ี�\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "�_ม��ห����ร�วม"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "���_ร�วม�ั�..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "�าร�_��ร�วม"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>�ื�อ</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "สิ��ิ��าร���า�ึ�"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "��ิ�ม/�����"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "�ี�อยู�_�ิ���อ"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "��ลี�ย���ล��_�ล��อร�/�ัว�ลือ�/��"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "อ�า�ราย�าร�ี�����_ส�ว��ัว"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "�ั��ึ���วย�ำ"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "�อ�รั���อมูล�า��ระ�าศ�����_�ือ��อ���า����า"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "�อ�รั���อมูล�า��าร�����_ห�ุ�อ���า����า"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "�_�ีย�"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 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-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "�ัว���"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>�ื�อ�ั��ี</b>"
 
-#. 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-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ล��ั��ึ����า������า�ะ�ัว���"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
+#: ../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
 #, 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-login.c:510
-msgid "_Proxy Login..."
-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:692
 msgid "The Proxy tab will be available only when the account is online."
@@ -18002,125 +17242,116 @@ msgstr "�����ัว����ะ����������อ�
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "�����ัว����ะ����������อ�มื�อ�ั��ี��ิ����"
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "��ิ�ม�ู����"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "�ัว�ลือ��ั��สู��อ��ารส��"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "�ู����"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "�รุ�า��อ��ื�อ�ู�����ละ�ั����า�ารอ�ุ�า����สิ��ิ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
-msgid "New _Shared Folder..."
-msgstr "��ล��อร��_��ร�วมอั��หม�..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "�าร���ร�วม"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "�าร�����ห�ุ�ำห���อ�"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "��ิ�ม   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
-msgid "Modify"
-msgstr "��ลี�ย���ล�"
-
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "ส�า�ะ��อ�วาม"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "�_รื�อ�:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "_�า�:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "วั��ี�สร�า�:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "�ู�รั�: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "�ึ��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "��ิ��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "�อ�รั��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "ล��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "��ิ�ส��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "�สร���มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "ส���ม��ึ��มื�อ: "
 
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Track Message Status..."
-msgstr "�ิ��ามส�า�ะ��อ�วาม..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "�ลั��อิ��ั����า�หล����ิ�ิ� hula"
+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 Account Setup"
-msgstr "�ั����า�ั��ี Hula"
+msgid "Hula Support"
+msgstr "�ารรอ�รั� Hula"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "รู�ภา�����อ�วาม"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "�ส��รู�ภา��ี����มาล�����อ�วาม�มล��ย�ร�"
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "��อมูลส�ว�หัว�ำห���อ�"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "��อมูลส�ว�หัว IMAP"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>��อมูลส�ว�หัว�ำห���อ�</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>��อมูลส�ว�หัว IMAP</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "��อมูลส�ว�หัว�ื���า��ละ�ี���ี�ยว�ั��_มลลิ�ลิส�� (��า�ริยาย)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "�ึ���อมูลส�ว�หัว_�ั��หม�"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18129,7 +17360,7 @@ msgstr ""
 "��ิ�ม��อมูลส�ว�หัว�ิ�ศษ�ี��ุ���อ��าร�ึ� �อ��ห�ือ�า���อมูลมา�ร�า���า����\n"
 "�ุ�สามาร���ามหัว��อ�ี������ ��า�ุ��ลือ� \"��อมูลส�ว�หัว�ั��หม�\""
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18137,7 +17368,7 @@ msgstr ""
 "�ลือ��รั�������อมูลส�ว�หัว IMAP �ี��ุ���อ��าร\n"
 "ยิ���ึ���อมูลส�ว�หัวมา� ���ะยิ������วลา�าว���หล��า��ึ��"
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18145,740 +17376,684 @@ msgstr ""
 "��อมูลส�ว�หัว_�ื���า� - (�ร�ว�ี�สุ�)\n"
 "�������ี���า�ุ��ม��������ัว�รอ��มล�ย��าม�มลลิ�ลิส��"
 
+#: ../plugins/imap-features/imap-headers.ui.h:10
+msgid "_Fetch All Headers"
+msgstr "�ึ���อมูลส�ว�หัว_�ั��หม�"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "�ลั��อิ�สำหรั��าร����า��ั��ี IMAP"
+msgid "Fine-tune your IMAP accounts."
+msgstr "�รั������ั��ี IMAP �อ��ุ�"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "�าร����า� IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "�ำ�_��า��ยั���ิ�ิ�"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "�ำ�_��า��ยั�ภาร�ิ�"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "�ำ���า ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "�ลือ�ราย�ารภาร�ิ�"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "�ลือ���ิ�ิ�"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "_�ำ���า"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "�ำ���าล�����ิ�ิ�"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "�ำ���า���ม������ ICS ล�����ิ�ิ�"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "�ม�����หล� Hardware Abstraction Layer �ว�"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"��อ�����ริ�าร \"hald\" ����ม�มี�ริ�าร�ั��ล�าว�ำ�า�อยู� �รุ�า��ิ��ริ�าร�ั��ล�าว "
-"�ล�ว�รีย���ร��รม�ี��หม� หรือ�ิ���อ�ู��ู�ลระ���อ��ุ�"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
-msgid "Search for an iPod failed"
-msgstr "���หา�อ�อ��ม���"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolution หา�อ�อ��ี��ะ sync ��วย�ม��� อา��ะ�ม������ื�อม��ออยู� หรืออา��ะ�ม������ิ�สวิ���"
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "รู���� iCalendar (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr "�รั���อมูลภาร�ิ�/�ั��ึ���วย�ำ/��ิ�ิ�/สมุ��ี�อยู� �ห��ร��ั� Apple iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "�รั���อมูล�ห��ร��ั� iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "�าร�รั���อมูล�ห��ร��ั� iPod"
-
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "�ม�สามาร���ิ���ิ�ิ� '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "มี�ั�หมาย����ิ�ิ� '%s' ���ั��าร�ระ�ุม�ี�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "���ั�หมาย����ิ�ิ� '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find any calendars"
 msgstr "�ม�����ิ�ิ����ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this meeting in any calendar"
 msgstr "�ม����าร�ระ�ุม�ี�����ิ�ิ����ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this task in any task list"
 msgstr "�ม���ภาร�ิ��ี���ราย�ารภาร�ิ����ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this memo in any memo list"
 msgstr "�ม����ั��ึ���วย�ำ�ี���ราย�าร�ั��ึ���วย�ำ���ลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:873
+msgid "Opening the calendar. Please wait.."
+msgstr "�ำลั���ิ���ิ�ิ� ��ร�รอสั��รู�.."
+
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "�ำลั����หา�ั�หมาย�ี��ี��ั��ึ��ว�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "�ม�สามาร����ราย�าร���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "�ม�สามาร�ส��ราย�าร��ยั���ิ�ิ� '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�า�อ�รั�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�าอา��อ�รั�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�า��ิ�ส�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ส����ยั���ิ�ิ� '%s' ว�าย��ลิ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "�ู��ระสา��า����ล��ู�รั�มอ��ั��ะ %s ออ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ส���ระ�าศ�ารย��ลิ���ยั��ู�รั�มอ��ั��ะ�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "�ม�สามาร�ส���ระ�าศ�ารย��ลิ���ยั��ู�รั�มอ��ั��ะ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "�ม�สามาร��รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม��� ��ื�อ��า�ส�า�ะ������า�ี�����ม����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "�ม�สามาร��รั���อมูล�ู����าร�วม %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "�รั���อมูล�ู����าร�วม�รีย�ร�อย�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr "ส����อมูล�าร�ระ�ุม�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "ส����อมูลภาร�ิ��ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "ส����อมูล�ั��ึ���วย�ำ�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "�ม�สามาร�ส����อมูล�าร�ระ�ุม��� ��ื�อ��า��ม�มี�าร�ระ�ุม�ี�อยู�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 msgid "Unable to send task information, the task does not exist"
 msgstr "�ม�สามาร�ส����อมูลภาร�ิ���� ��ื�อ��า��ม�มีภาร�ิ��ี�อยู�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "�ม�สามาร�ส����อมูล�ั��ึ���วย�ำ��� ��ื�อ��า��ม�มี�ั��ึ���วย�ำ�ี�อยู�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1529
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1534
+msgid "Save Calendar"
+msgstr "�ั��ึ���ิ�ิ�"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "��ิ�ิ�����าร�ม����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "��อ�วามอ�า�ว�ามี��ิ�ิ� ����ัว��ิ�ิ��ม���� iCalendar �ี�����าร���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid "The item in the calendar is not valid"
 msgstr "ราย�าร����ิ�ิ��ม��ู���อ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 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:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "��ิ�ิ��ี����มามีราย�ารหลายราย�าร"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "��ื�อ�ะ�ำ��ิ��า�ราย�าร�ั��หม� �วร�ั��ึ����ม�ล�ว�ำ���า��ิ�ิ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
 msgstr "�าร�ระ�ุม�ี��วีย���ำ����รอ��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2450
 msgid "This task recurs"
 msgstr "ภาร�ิ��ี��วีย���ำ����รอ��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2453
 msgid "This memo recurs"
 msgstr "�ั��ึ���วย�ำ�ี��วีย���ำ����รอ��"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2682
 msgid "_Delete message after acting"
 msgstr "_ล���อ�วามหลั��า��ำ�ล�ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2725
 msgid "Conflict Search"
 msgstr "�าร���หา�าร���ั�"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2707
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "�ลือ���ิ�ิ��ี��ะ���หา�าร�ระ�ุม�ี����ั�"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "วั��ี�"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "วั��ี� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "วั��ี� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 msgid "Today %l:%M:%S %p"
 msgstr "วั��ี� %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "�รุ���ี�"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "�รุ���ี� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 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:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "�รุ���ี� %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "�รุ���ี� %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, 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:261
+#: ../plugins/itip-formatter/itip-view.c:265
 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:265
+#: ../plugins/itip-formatter/itip-view.c:269
 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:270
+#: ../plugins/itip-formatter/itip-view.c:274
 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:274
+#: ../plugins/itip-formatter/itip-view.c:278
 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:283
+#: ../plugins/itip-formatter/itip-view.c:287
 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:289
+#: ../plugins/itip-formatter/itip-view.c:293
 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:293
+#: ../plugins/itip-formatter/itip-view.c:297
 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:298
+#: ../plugins/itip-formatter/itip-view.c:302
 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:302
+#: ../plugins/itip-formatter/itip-view.c:306
 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:308
+#: ../plugins/itip-formatter/itip-view.c:312
 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:313
+#: ../plugins/itip-formatter/itip-view.c:317
 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:317
+#: ../plugins/itip-formatter/itip-view.c:321
 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:322
+#: ../plugins/itip-formatter/itip-view.c:326
 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:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Ey %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../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:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "���รั����าม�อ� <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../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:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ����ระ�าศ��อมูล�าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ���มอ��ั��ะ�าร�ระ�ุม��อ���ี��ห��ั��ุ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../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 �อ�ห��ุ����าร�วม�าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> �อ�ห��ุ����าร�วม�าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ������า� %s �อ��ิ�ม��ิม��อมูล���าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> �อ��ิ�ม��ิม��อมูล���าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> ������า� %s �อ��อมูลล�าสุ��อ��าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ��อ��าร��อมูลล�าสุ��อ��าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../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 ���ส���ำ�อ�สำหรั��าร�ระ�ุม�ลั�มา�ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ���ส���ำ�อ�สำหรั��าร�ระ�ุม�ลั�มา�ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../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 �อย��ลิ��าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ���ย��ลิ��าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../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 �ส�อ�อ��ลี�ย���ล��าร�ระ�ุม�ั��ี�"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ����ส�อ�อ��ลี�ย���ล��าร�ระ�ุม�ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../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 �อ��ิ�ส��าร��ลี�ย���ล��าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> �����ิ�ส��าร��ลี�ย���ล��าร�ระ�ุม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ���������า� %s �ระ�าศภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ����ระ�าศภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> �อมอ�หมาย %s �ห��ำภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ���������า� %s �อมอ�หมายภาร�ิ��ห��ั��ุ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ���มอ�หมายภาร�ิ��ห��ั��ุ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> ������า� %s �อ��ิ�ม��ิม��อมูล��ภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> �อ��ิ�ม��ิม��อมูล��ภาร�ิ���อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> ������า� %s �อ��อมูลล�าสุ��อ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> ��อ��าร��อมูลล�าสุ��อ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../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 ���ส���ำ�อ�สำหรั�ภาร�ิ��ี�มี�ารมอ�หมาย�ลั�มา�ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../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> ���ส���ำ�อ�สำหรั�ภาร�ิ��ี�มี�ารมอ�หมาย�ลั�มา�ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../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 �อย��ลิ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ���ย��ลิ�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../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 �ส�อ��ลี�ย���ล��ารมอ�หมายภาร�ิ��ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ����ส�อ��ลี�ย���ล��ารมอ�หมายภาร�ิ��ั��ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../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 �อ��ิ�ส�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> �����ิ�ส�ภาร�ิ��ี�มี�ารมอ�หมาย��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ���������า� %s �ระ�าศ�ั��ึ���วย�ำ��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ����ระ�าศ�ั��ึ���วย�ำ��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> ������า� %s �อ��ิ�ม��ิม��อมูล���ั��ึ���วย�ำ��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> �อ��ิ�ม��ิม��อมูล���ั��ึ���วย�ำ��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ������า� %s �อย��ลิ��ั��ึ���วย�ำ���ร�วม��อ���ี�:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ���ย��ลิ��ั��ึ���วย�ำ��อ���ี�:"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "�ั��วั�:"
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "วั��ริ�ม���:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1045
+msgid "Start time:"
+msgstr "�วลา�ริ�ม:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "วั�สิ��สุ�:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1056
+msgid "End time:"
+msgstr "�วลาสิ��สุ�:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "_��ิ���ิ�ิ�"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
 #: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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
 msgid "_Decline"
 msgstr "_��ิ�ส�"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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"
 msgstr "�อ�_รั�"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "_��ิ�ส��ั��หม�"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "�อ�รั��_ม�ยื�ยั��ั��หม�"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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
 msgid "_Tentative"
 msgstr "�อ�รั��_ม�ยื�ยั�"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "�อ�_รั��ั��หม�"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "_ส����อมูล"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "_�รั���อมูลส�า�ะ�ู����าร�วม�ระ�ุม"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "_�รั���อมูล"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
-msgid "Start time:"
-msgstr "�วลา�ริ�ม:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
-msgid "End time:"
-msgstr "�วลาสิ��สุ�:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1076
+#: ../plugins/itip-formatter/itip-view.c:1130
 msgid "Comment:"
 msgstr "หมาย�ห�ุ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _reply to sender"
 msgstr "_�อ���ยั��ู�ส��"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1145
 msgid "Send _updates to attendees"
 msgstr "ส���าร_�รั���อมูล��ยั��ู�ร�วม�ระ�ุม"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Apply to all instances"
 msgstr "����ั�_�ุ�รอ��ี��วีย���ำ"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "Show time as _free"
 msgstr "�ส���วลาว�า_ว�า�"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1166
 msgid "_Preserve my reminder"
 msgstr "_รั�ษาราย�าร��ือ��อ���า����า�ว�"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "_Inherit reminder"
 msgstr "_สื��อ�ราย�าร��ือ�"
 
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "_ภาร�ิ� :"
+#: ../plugins/itip-formatter/itip-view.c:1915
+msgid "_Tasks:"
+msgstr "_ภาร�ิ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "�ั��ึ���วย�ำ :"
+#: ../plugins/itip-formatter/itip-view.c:1917
+msgid "_Memos:"
+msgstr "_�ั��ึ���วย�ำ:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "�ส��ส�ว���อมูล text/calendar ����อ�วาม"
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "�ส��ส�ว���อมูล MIME \"text/calendar\" ����อ�วาม�มล"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18901,18 +18076,6 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "�ำ�อ��ี��ม����มา�า��ู�ร�วม�ระ�ุม�ั��ุ�ั�  �ะ��ิ�ม�ู�ส�����า�����ู�ร�วม�ระ�ุมหรือ�ม�?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "_ออ��า��าร���าระ�����า�ะ�ัว���"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "�ห��ลือ��ิ�����ั��ี���"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable Account"
-msgstr "�ิ�����ั��ี"
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ส���สีย��ี��หรือ�ล�����ม�สีย�"
@@ -18948,51 +18111,55 @@ msgid "Play sound when new messages arrive."
 msgstr "ส���สีย��มื�อมี��อ�วาม���ามา�หม�"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "�ล���สีย��าม�ุ��สีย��มื�อมี��อ�วาม���ามา�หม� ��า�ม��������หม��าร�ี��"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "�ุ���อ�วาม�ึ���ร�อม�ั��อ�อ���วย"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "�ส���อ�อ��มล�หม����ื���ี������ห�ุ�มื�อมี��หมาย�หม�มา�ึ�"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "�ื�อ���ม�สีย��ี��ะ�ล��"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "���ม�สีย��ี��ะ�ล���มื�อมี��อ�วาม���ามา�หม� ��า�ม��������หม��าร�ี��"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr "����ุ��สีย�"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "�ำห��ว�า�ะ�ล�����ม�สีย�หรือส���สีย��ี���มื�อมี��อ�วาม���ามา�หม�"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "�ำห��ว�า�ะ�ส����อ�วาม�ร�อม�ั��อ�อ���วยหรือ�ม��มื�อมี��อ�วาม���ามา�หม�"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "�ำห��ว�า�ะ�ะ�ริ��อ�อ���วยหรือ�ม�"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�ำห��ว�า�ะ������อ�วาม�หม����าะสำหรั��ล�อ���หมาย���าหรือ�ม�"
 
-#: ../plugins/mail-notification/mail-notification.c:260
-msgid "Generate a _D-Bus message"
-msgstr "ส����อ�วาม _D-Bus"
-
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "�าร�����มล�อ� Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../plugins/mail-notification/mail-notification.c:366
 msgid "Mail Notification Properties"
 msgstr "�ุ�สม�ั�ิ�าร�����มล"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:483
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19007,152 +18174,304 @@ msgstr[1] ""
 "�ุ����รั���อ�วาม�หม� %d ��อ�วาม\n"
 "�� %s"
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, 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
+#, c-format
+msgid "Subject: %s"
+msgstr "�รื�อ�: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, 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:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "อี�มล�หม�"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "�ส���อ�อ����ื���ี��_����ห�ุ"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "_�ะ�ริ��อ�อ����ื���ี������ห�ุ"
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "�ุ�_��อ�วาม�ึ���ร�อม�ั��อ�อ���วย"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "ส���_สีย��มื�อมี��อ�วาม���ามา�หม�"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "�สีย�_�ี��"
 
-#: ../plugins/mail-notification/mail-notification.c:763
-msgid "Play _sound file"
-msgstr "�ล���_��ม�สีย�"
+#: ../plugins/mail-notification/mail-notification.c:869
+msgid "Use sound _theme"
+msgstr "����ุ��_สีย�"
 
-#: ../plugins/mail-notification/mail-notification.c:774
-msgid "Specify _filename:"
-msgstr "_ระ�ุ�ื�อ���ม:"
+#: ../plugins/mail-notification/mail-notification.c:888
+msgid "Play _file:"
+msgstr "�ล���สีย_�:"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "�ลือ����ม�สีย�"
 
-#: ../plugins/mail-notification/mail-notification.c:776
-msgid "Pl_ay"
-msgstr "�_ล��"
-
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "������อ�วาม�หม����าะสำหรั��ล�อ���หมาย�_��า���า�ั��"
 
+#: ../plugins/mail-notification/mail-notification.c:966
+msgid "Generate a _D-Bus message"
+msgstr "ส����อ�วาม _D-Bus"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "�าร�����มล��ั��หม�"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+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
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "สร�า��า��มล�อ� %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
+#, 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
+#, 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
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr ""
-"ส����อ�วาม D-Bus หรือ������ือ��ู������วย�อ�อ����ื���ี������ห�ุ�ละ��อ�วาม������ือ� "
-"�มื�อมี��อ�วาม���ามา�หม�"
+"ราย�าร�ั��ึ���วย�ำ�ี��ลือ�มี�ั��ึ���วย�ำ '%s' อยู���อ��ล�ว �ุ���อ��าร�ะ������ั��ึ���วย�ำ���าหรือ�ม�?"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "�าร�����มล��ั��หม�"
+#: ../plugins/mail-to-task/mail-to-task.c:519
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"��ิ�ิ��ี��ลือ�มี�ห�ุ�าร��สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า��ห�ุ�าร���หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "�ลั��อิ���วยสร�า��าร�ระ�ุม�า���ื�อหา��อ�วาม���มล"
+"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
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"ราย�าร�ั��ึ���วย�ำ�ลือ�มี�ั��ึ���วย�ำสำหรั��มล�ี��ำห��อยู���อ��ล�ว "
+"�ุ���อ��าร�ะสร�า��ั��ึ���วย�ำ�หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "�_�ล��������าร�ระ�ุม"
+#: ../plugins/mail-to-task/mail-to-task.c:543
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"��ิ�ิ��ี��ลือ�มี�ห�ุ�าร��สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า��ห�ุ�าร���หม���อ��หรือ�ม�?"
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+"��ิ�ิ��ี��ลือ�มี�ห�ุ�าร��สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า��ห�ุ�าร���หม���อ��หรือ�ม�?"
+msgstr[1] ""
+"��ิ�ิ��ี��ลือ�มี�ห�ุ�าร��สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า��ห�ุ�าร���หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "�า��มล�����าร�ระ�ุม"
+#: ../plugins/mail-to-task/mail-to-task.c:549
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+"ราย�ารภาร�ิ��ี��ลือ�มีภาร�ิ�สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า�ภาร�ิ��หม���อ��หรือ�ม�?"
+msgstr[1] ""
+"ราย�ารภาร�ิ��ี��ลือ�มีภาร�ิ�สำหรั��มล�ี��ำห��อยู���อ��ล�ว �ุ���อ��าร�ะสร�า�ภาร�ิ��หม���อ��หรือ�ม�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:295
+#: ../plugins/mail-to-task/mail-to-task.c:555
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"ราย�าร�ั��ึ���วย�ำ�ี��ลือ�มี�ั��ึ���วย�ำสำหรั��มล�ี��ำห��อยู���อ��ล�ว "
+"�ุ���อ��าร�ะสร�า��ั��ึ���วย�ำ�หม���อ��หรือ�ม�?"
+msgstr[1] ""
+"ราย�าร�ั��ึ���วย�ำ�ี��ลือ�มี�ั��ึ���วย�ำสำหรั��มล�ี��ำห��อยู���อ��ล�ว "
+"�ุ���อ��าร�ะสร�า��ั��ึ���วย�ำ�หม���อ��หรือ�ม�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:614
+msgid "[No Summary]"
+msgstr "[�ม�มีสรุ�]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:625
+msgid "Invalid object returned from a server"
+msgstr "���รั�อ�อ�������ี��ม��ู���อ��ื�มา�า���ิร���วอร�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:696
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "��ิ���อ�ิ��ลา���ะ�ระมวล�ล: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "�ม�สามาร���ิ���ิ�ิ�  %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:300
+#: ../plugins/mail-to-task/mail-to-task.c:732
+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
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
-msgstr ""
-"�หล���ี��ลือ�สามาร�อ�า����อย�า���ียว �ึ��ม�สามาร�สร�า�ราย�ารภาร�ิ��ี��ั�� �รุ�า�ลือ��หล���หม�"
+msgstr "�หล���ี��ลือ�สามาร�อ�า����อย�า���ียว �ึ��ม�สามาร�สร�า�ภาร�ิ��ี��ั�� �รุ�า�ลือ��หล���หม�"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "�ลั��อิ���วยสร�า�ภาร�ิ��า���ื�อหา��อ�วาม���มล"
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr ""
+"�หล���ี��ลือ�สามาร�อ�า����อย�า���ียว �ึ��ม�สามาร�สร�า��ั��ึ���วย�ำ�ี��ั�� �รุ�า�ลือ��หล���หม�"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "�_�ล�������ภาร�ิ�"
+#: ../plugins/mail-to-task/mail-to-task.c:941
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "�ม�สามาร�อ�า�ราย�ื�อ�หล�� %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "�า��มล����ภาร�ิ�"
+#: ../plugins/mail-to-task/mail-to-task.c:1060
+msgid "Create an _Event"
+msgstr "สร�า��_ห�ุ�าร��"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "��ล���อ�วาม�ี��ลือ�����ภาร�ิ��ิ���หม�"
+#: ../plugins/mail-to-task/mail-to-task.c:1062
+msgid "Create a new event from the selected message"
+msgstr "สร�า��ห�ุ�าร���หม��า���อ�วาม�ี��ลือ�อยู�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "�ิ���อ�_��า�อ�ลิส��"
+#: ../plugins/mail-to-task/mail-to-task.c:1067
+msgid "Create a Mem_o"
+msgstr "สร�า�_�ั��ึ���วย�ำ"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:1069
+msgid "Create a new memo from the selected message"
+msgstr "สร�า��ั��ึ���วย�ำ�หม��า���อ�วาม�ี��ลือ�อยู�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1074
+msgid "Create a _Task"
+msgstr "สร�า�_ภาร�ิ�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1076
+msgid "Create a new task from the selected message"
+msgstr "สร�า�ภาร�ิ��หม��า���อ�วาม�ี��ลือ�อยู�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+msgid "Create a _Meeting"
+msgstr "สร�า��าร_�ระ�ุม"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1086
+msgid "Create a new meeting from the selected message"
+msgstr "สร�า��าร�ระ�ุม�หม��า���อ�วาม�ี��ลือ�อยู�"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "��ล���อ�วาม�มล�ห�����ภาร�ิ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Archive"
 msgstr "�ู_�รุ��อ�วาม���า�อ�ลิส��"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get an archive of the list this message belongs to"
+msgstr "�ู�รุ��อ�วาม���า�อ�ลิส���ี���������อ�อ���อ�วาม�ี�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Get List _Usage Information"
 msgstr "�ู��อมูล_วิ�ี����อ�ลิส��"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "��ิ�ั�ิ�าร�มลลิ�ลิส��"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "�ู��อมูล��ี�ยว�ั�วิ�ี����อ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "�_มลลิ�ลิส��"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "Contact List _Owner"
+msgstr "�ิ���อ�_��า�อ�ลิส��"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "��ิ�ั�ิ�ารสำหรั��ำสั�����ิ�อ��มลลิ�ลิส�� (สมั�รสมา�ิ�, ย��ลิ��ารสมั�ร, ...)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "�ิ���อ���า�อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Post Message to List"
 msgstr "_ส����อ�วาม���าลิส��"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "ส����อ�วาม���า�มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Subscribe to List"
 msgstr "ส_มั�ร���าลิส��"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "ย��_ลิ��ารสมั�ร���าลิส��"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "สมั�ร����สมา�ิ��อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+msgid "_Unsubscribe from List"
+msgstr "�_ลิ��อ�รั���อมูล�า�ลิส��"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "ย��ลิ��ารสมั�ร����สมา�ิ��อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+msgid "Mailing _List"
+msgstr "�_มลลิ�ลิส��"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "��ิ�ั�ิ�าร�มลลิ�ลิส��"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "�ำ�ำสั���ั�ว���อ��มลลิ�ลิส�� (สมั�รสมา�ิ�, ย��ลิ��ารสมั�ร ฯลฯ)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -19231,59 +18550,11 @@ msgstr "�_������อ�วาม"
 msgid "_Send message"
 msgstr "_ส����อ�วาม"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "�ิ���อ�_��า�อ�ลิส��"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "�ิ���อ���า�อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "�ู_�รุ��อ�วาม���า�อ�ลิส��"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "�ู��อมูล_วิ�ี����อ�ลิส��"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "�ู�รุ��อ�วาม���า�อ�ลิส���ี���������อ�อ���อ�วาม�ี�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "�ู��อมูล��ี�ยว�ั�วิ�ี����อ�ลิส���ี���������อ�อ���อ�วาม�ี�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "ส����อ�วาม���า�มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "สมั�ร����สมา�ิ��อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "ย��ลิ��ารสมั�ร����สมา�ิ��อ��มลลิ�ลิส���ี���������อ�อ���อ�วาม�ี�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_ส����อ�วาม���าลิส��"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "ส_มั�ร���าลิส��"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "�_ลิ��อ�รั���อมูล�า�ลิส��"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "�ะ�ำ��รื�อ�หมาย��อ�วาม����ล��อร�ย�อย��วยหรือ�ม�?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19291,106 +18562,106 @@ msgstr ""
 "�ะ�ำ��รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว����ล��อร��ั��ุ�ั����า�ั�� "
 "หรือ�ะ�ำ��รื�อ�หมาย����ล��อร�ย�อย�ั��หม���วย?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "��ล��อร��ั��ุ�ั��ละ��ล��อร�_ย�อย"
+#: ../plugins/mark-all-read/mark-all-read.c:168
+msgid "In Current Folder and _Subfolders"
+msgstr "����ล��อร��ั��ุ�ั��ละ��ล��อร�_ย�อย"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "��ล��อร�_�ั��ุ�ั����า�ั��"
+#: ../plugins/mark-all-read/mark-all-read.c:182
+msgid "In Current _Folder Only"
+msgstr "����ล��อร�_�ั��ุ�ั����า�ั��"
+
+#: ../plugins/mark-all-read/mark-all-read.c:402
+msgid "Mark Me_ssages as Read"
+msgstr "�ำ��รื�อ�หมาย�ุ�_��อ�วามว�าอ�า��ล�ว"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "�ำ��รื�อ�หมายอ�า��ล�ว�ั��หม�"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "�ำ��รื�อ�หมาย�ุ�_��อ�วามว�าอ�า��ล�ว"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "����ำ��รื�อ�หมาย�ุ���อ�วาม�����ล��อร��ี��ำห��ว�าอ�า��ล�ว"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "�ลั��อิ���ื�อม��อ�ลั��อิ� Mono"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Mono Loader"
-msgstr "�ลั��อิ��หล� Mono"
+msgid "Mark all messages in a folder as read."
+msgstr "�ำ��รื�อ�หมาย�ุ���อ�วาม����ล��อร�ว�าอ�า��ล�ว"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "�ลั��อิ�สำหรั��ั��าร��ิ�-�ิ��ลั��อิ���า��"
+msgid "Manage your Evolution plugins."
+msgstr "�ั��าร�ลั��อิ��อ� Evolution"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
-msgstr "�ู��ั��าร�ลั��อิ�"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "��ิ�หรือ�ิ�����า��ลั��อิ�"
+msgstr "��รื�อ�มือ�ั��าร�ลั��อิ�"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "_�ลั��อิ�"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "�ู���ีย�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "��า�ั��"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "หมาย�ห�ุ: �าร��ลี�ย���ล��า�อย�า��ะยั��ม�มี�ล���ว�า�ะ�ริ�ม�าร�ำ�า��หม�"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "ภา�รวม"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "�ลั��อิ�"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"�ลั��อิ���สอ� �ึ��สา�ิ��ลั��อิ��ั��รีย���อ�วาม �ห��ุ��ลือ��ี��ะ�ิ��าร�����อ�วาม��� HTML ���\n"
-"\n"
-"�ลั��อิ��ี�������ีย�����สา�ิ��ี��ม�มี�าร�ู�ล���า�ั��\n"
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "_�ลั��อิ�"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "��ิ�หรือ�ิ�����า��ลั��อิ�"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
-msgstr "�หม���อ�วามล�ว�"
+msgstr "�หม���อ�วาม��ล�า"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
-msgstr "�อ������อ�วามล�ว�"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
+msgstr "�ิยม�����อ�วาม��ล�า"
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "�ส����อ�วาม�มล�����อ�วาม��ล�า �ม���ื�อหา�ะ���� HTML"
+
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "�ส�� HTML ��าส��มา��วย"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "�ส����อ�วามล�ว���า���������"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr "�ห� Evolution �ลือ��ส��ส�ว��ี��ี�ี�สุ��ี�ส��มา"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
-msgstr "�ส����อ�วามล�ว����า�ั��"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid "Show plain text if present"
+msgstr "�ส����อ�วาม��ล�า��าส��มา��วย"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:202
+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
+msgid "Only ever show plain text"
+msgstr "�ส����อ�วาม��ล�า���า�ั��"
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr "�ส��ส�ว��ี�������อ�วาม��ล�า���า�ั�� �ละ�ำส�ว�อื���ห��������ม�����าร�อ��อ"
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "�ส��ส�ว� HTML �ี�_�ั������������ม���"
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "�_หม� HTML"
 
@@ -19399,8 +18670,8 @@ msgid "Evolution Profiler"
 msgstr "��รื�อ�มือวั��ระสิ��ิภา� Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "��ีย��ั��ึ��ห�ุ�าร���ี���ี�ยว�ั���อมูล�ารวั��ระสิ��ิภา�"
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "�รว�วั��ห�ุ�าร���ารรั�ส����อมูล�� Evolution (สำหรั��ั��ั��า���า�ั��)"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19414,381 +18685,372 @@ msgstr "��รื�อ�มือ�ำ���า Outlook PST"
 msgid "Outlook personal folders (.pst)"
 msgstr "��ล��อร�ส�ว��ุ��ล�อ� Outlook (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "�_มล"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "_สมุ��ี�อยู�"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "_�ั�หมาย"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_ภาร�ิ�"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "ราย�าร_�ั��ึ�"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "�ำลั��ำ���า��อมูล Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "��วย��ะ�ระ�าศ��ิ�ิ����ว��"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "�าร��ะ�ระ�าศ��ิ�ิ�"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "�ำ�ห���"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "��อมูล�าร��ะ_�ระ�าศ��ิ�ิ�"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "��ะ�ระ�าศ��ิ�ิ����ว��"
+
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
+#, c-format
+msgid "Could not open %s:"
+msgstr "�ม�สามาร���ิ� %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:210
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "�ม�สามาร���ิ� %s: ��อ�ิ��ลา��ม��รา�สา�ห�ุ"
+
+#: ../plugins/publish-calendar/publish-calendar.c:230
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "��ิ���อ�ิ��ลา���ะ��ะ�ระ�าศ��ยั� %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:232
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "��ะ�ระ�าศ��ยั� %s สำ�ร���ล�ว"
+
+#: ../plugins/publish-calendar/publish-calendar.c:276
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "�มา��� %s �ม�สำ�ร��:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "�_�ิ�����า�"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "�ุ������หรือ�ม�ว�า ��อ��ารล��ำ�ห����ี��ั���ี�?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">�ำ�ห���</span>"
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
+msgid "Could not create publish thread."
+msgstr "�ม�สามาร�สร�า���ร�สำหรั���ะ�ระ�าศ"
+
+#: ../plugins/publish-calendar/publish-calendar.c:1059
+msgid "_Publish Calendar Information"
+msgstr "��อมูล�าร��ะ_�ระ�าศ��ิ�ิ�"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">�หล��</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "�หล���ำห���อ�"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
-msgstr ""
-"รายวั�\n"
-"รายสั��าห�\n"
-"�ำ�อ� (��า��ม�ู��ิ�ั�ิ�าร)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "รายวั�"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "�_�ิ�����า�"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (ล�อ�อิ�)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "�ำ�อ� (��า��ม�ู��ิ�ั�ิ�าร)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "_�อร��:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "FTP สา�าร�ะ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "�ำ�ห����ระ�าศ"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "�วาม_�ี��อ��าร�ระ�าศ:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"FTP �ิรภัย (SSH)\n"
-"FTP สา�าร�ะ\n"
-"FTP (ล�อ�อิ�)\n"
-"��ล��อร����ร�วม�อ�วิ���วส�\n"
-"WebDAV (HTTP)\n"
-"WebDAV �ิรภัย (HTTPS)\n"
-"�ำ�ห����ำห���อ�"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "FTP �ิรภัย (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "WebDAV �ิรภัย (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "_��ิ��ริ�าร:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "�หล��"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+msgid "Time _duration:"
+msgstr "_��ว��วลา:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "รายสั��าห�"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "��ล��อร����ร�วม�อ�วิ���วส�"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "�_��ม:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "_รหัส��า�:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "_�ระ�าศ����:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "_�ำรหัส��า�"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "_�ื�อ�ู����:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"ว�า�/�ม�ว�า�"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "�ม�สามาร���ะ�ระ�าศ��ิ�ิ�: �����อ�����ิ�ิ��ม�มีอยู�อี���อ��"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "�หล���หม�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "������หล��"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "สวัส�ี���อ�"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "��สอ��ัว�หล��ลั��อิ����อ�"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "�ลั��อิ����อ���สอ�"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "�ลั��อิ���สอ�สำหรั��ัว�หล� EPlugin ���อ�"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "�ลั��อิ��ึ���หล��ลั��อิ�อื���ี���ีย���วยภาษา���อ�"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "�ัว�หล����อ�"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (�ั����ัว)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "�ม��� SpamAssassin, รหัส: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "�ม�สามาร�สร�า�����: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "��ิ���อ�ิ��ลา�หลั� fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "��ร��สลู� SpamAssassin �ม��อ�ส�อ� �ะ��า�ิ��..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "�าร�อย��ร��สลู� SpamAssassin �ู��ั��ั�หวะ �ะ����ร��รม..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "สร�า�������ยั� SpamAssassin �ม�สำ�ร�� รหัส��อ�ิ��ลา�: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
 #, c-format
-msgid "SpamAssassin is not available."
-msgstr "�ม�มี SpamAssassin"
+msgid "SpamAssassin is not available. Please install it first."
+msgstr "�ม�มี SpamAssassin ��ระ�� �รุ�า�ิ��ั���สีย��อ�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�าร��สอ��ี��ะ�ำ�ห� SpamAssassin ��า��ื�อ�ือ�ึ�� ����ำ�า���าล�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "_��สอ��ฮส��ระยะ��ล��วย"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr "�รอ���อ�วาม�ยะ��วย SpamAssassin  �าร����ลั��อิ��ี� ��อ��ิ��ั�� SpamAssassin ��วย"
+msgid "Filter junk messages using SpamAssassin."
+msgstr "�รอ��มล�ยะ��ย��� SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "�ัว�ลือ�สำหรั� SpamAssassin"
+msgid "SpamAssassin Junk Filter"
+msgstr "�ลั��อิ��รอ��ยะ SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "�ลั��อิ��รอ��ยะ��วย SpamAssassin"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "�ลั��อิ�สำหรั��ั��ึ����ม���หรือส�ว���า�� �อ���อ�วาม���ราว��ียว"
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "�ั��ึ����ม���"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "�ั��ึ����ม���..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "�ั��ึ����ม����ั��หม�"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "�ลือ��ื�อ���สำหรั��าร�ั��ึ�"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "��ิ� MIME"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "�ั��ึ�"
+msgid "SpamAssassin Options"
+msgstr "�ัว�ลือ�สำหรั� SpamAssassin"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "ราย�าร�ำ�รรยาย"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "ราย�ื�อหมว�"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "ราย�ารหมาย�ห�ุ"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "สร�า�"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
-msgstr "ราย�ื�อ�ี�อยู��ิ���อ"
+msgstr "ราย�ื�อ�ู��ิ���อ"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "�ริ�ม"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "สิ��สุ�"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "ร�อยละ�ี��สร��"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "ราย�ื�อ�ู����าร�วม�ระ�ุม"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "��ลี�ย���ล�"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "�ัว�ลือ��ั��สูลสำหรั�รู���� CSV"
+#: ../plugins/save-calendar/csv-format.c:530
+msgid "A_dvanced options for the CSV format"
+msgstr "�ัว�ลือ�_�ั��สูลสำหรั�รู���� CSV"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "��ิม��อมูลส�ว�หัว"
+#: ../plugins/save-calendar/csv-format.c:537
+msgid "Prepend a _header"
+msgstr "��ิม��อมูลส�ว�_หัว"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "��รื�อ�หมาย�ั��ระหว�า���า:"
+#: ../plugins/save-calendar/csv-format.c:546
+msgid "_Value delimiter:"
+msgstr "��รื�อ�หมาย�ั��ระหว�า�_��า:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "��รื�อ�หมาย�ั��ระ��ีย�:"
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "_Record delimiter:"
+msgstr "��รื�อ�หมาย�ั��_ระ��ีย�:"
 
 #: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "�รอ���า��วย:"
+msgid "_Encapsulate values with:"
+msgstr "�รอ_���า��วย:"
 
 #: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "รู�����ั����วย�ุลภา� (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "รู���� iCalendar (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "�ั��ึ�สิ���ี��ลือ�"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "�ั��ึ���ิ�ิ�หรือราย�ารภาร�ิ��ี��ลือ�ล��ิส��"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "_�ั��ึ�ล��ิส��"
+msgid "Save a calendar or task list to disk."
+msgstr "�ั��ึ���ิ�ิ�หรือราย�ารภาร�ิ�ล��ิส��"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "รู���� RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:111
+msgid "_Format:"
+msgstr "รู��_��:"
+
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "�ลือ����ม�ลาย�า�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "�ลือ��หล����ียว"
+#: ../plugins/save-calendar/save-calendar.c:325
+msgid "Save the selected calendar to disk"
+msgstr "�ั��ึ���ิ�ิ��ี��ลือ�ล��ิส��"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "�ลือ��หล����ิ�ิ�หรือภาร�ิ���ีย��หล����ียว��ื�อ�ู"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "�_ส�����าะ��ิ�ิ��ี�"
+#: ../plugins/save-calendar/save-calendar.c:356
+msgid "Save the selected memo list to disk"
+msgstr "�ั��ึ�ราย�าร�ั��ึ���วย�ำ�ี��ลือ�ล��ิส��"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "�ส�����าะ_�ั��ึ���วย�ำ�ี�"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "�ส�����าะราย�าร_ภาร�ิ��ี�"
+#: ../plugins/save-calendar/save-calendar.c:387
+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."
@@ -19798,15 +19060,15 @@ msgstr "�ำ�ุ�สู��าร�ั����า�ั��ี�
 msgid "Setup Assistant"
 msgstr "�ู���วย�ั����า"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
 msgstr "�ู���วย�ั����า Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "ยิ��ี��อ�รั�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../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"
@@ -19818,35 +19080,32 @@ msgstr ""
 "\n"
 "�รุ�า���ุ�ม \"�ั���\" ��ื�อ�ำ�า���อ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
-msgid "Importing files"
-msgstr "�าร�ำ���า���ม"
-
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../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:152
-#: ../shell/e-shell-importer.c:394
+#: ../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:232
-#: ../shell/e-shell-importer.c:505
-#, c-format
+#: ../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:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:250
 msgid "Please wait"
 msgstr "�รุ�ารอสั��รู�"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "�รว�สอ�ว�า�าร�รีย��ระ�ู��อ���อ�วาม�วร�ยายาม����าร�รีย��าม�ื�อ�รื�อ�หรือ�ม�"
+msgid "Sort mail message threads by subject."
+msgstr "�ั��ระ�ู���อ�วาม�มล�ามหัว��อ�รื�อ�"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19854,12 +19113,12 @@ msgstr "�รีย��ระ�ู��าม�ื�อ�รื�อ�
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
-msgstr "�ั��ระ�ู���อ�วาม��วยหัว��อ�รื�อ�"
+msgstr "�ั��ระ�ู���อ�วาม�ามหัว��อ�รื�อ�"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
-msgstr "�ยายาม�ั�_�ระ�ู���วยหัว��อ�รื�อ�"
+msgstr "�ยายาม�ั�_�ระ�ู��ามหัว��อ�รื�อ�"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
@@ -19867,67 +19126,82 @@ msgid ""
 "message body."
 msgstr "ราย�าร�ู� �ำหลั�/��า สำหรั��ลั��อิ� \"�ม����\" �ี��ะ�������ี���อ�วาม���ัว��ื�อ�วาม"
 
-#: ../plugins/templates/templates.c:603
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "�ลั��อิ��ม�����ี�อาศัย���ร�า�"
+
+#: ../plugins/templates/templates.c:617
+msgid "No Title"
 msgstr "�ม�มี�ื�อ"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "�ั��ึ������_ม����"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "�ั��ึ������ม����"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "�ลั��อิ��ม�����ี�อาศัย���ร�า�"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "�ลั��อิ�อย�า���าย�ี���� yTNEF อ�า����ม��� TNEF"
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "อ�า�รหัส���ม��� TNEF (winmail.dat) �า� Microsoft Outlook"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "�ลั��อิ�อ�า����ม��� TNEF"
+msgid "TNEF Decoder"
+msgstr "�ลั��อิ�อ�า�รหัส TNEF"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "vCard ���รร�ั�"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "�ส�� vCard ล�����อ�วาม�มล��ย�ร�"
+
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
+msgid "Show Full vCard"
+msgstr "�ส�� vCard ������ม"
+
+#: ../plugins/vcard-inline/vcard-inline.c:163
+msgid "Show Compact vCard"
+msgstr "�ส�� vCard ����ระ�ั�"
+
+#: ../plugins/vcard-inline/vcard-inline.c:224
+msgid "There is one other contact."
+msgstr "มี�ู��ิ���ออื��ห�ึ��ราย�าร"
+
+#: ../plugins/vcard-inline/vcard-inline.c:233
+#, 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
+msgid "Save in Address Book"
+msgstr "�ั��ึ�ล���สมุ��ี�อยู�"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "�ลั��อิ��ั����า�ี�อยู��ิ���อ WebDAV"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "��ิ�ม�ู��ิ���อ WebDAV ���า�� Evolution"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "�ี�อยู��ิ���อ WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "หลี��_ลี�ย� IfMatch (�ำ����สำหรั� Apache < 2.2.8)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "��ลล� Evolution"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "�ร��า��ั����า��ลล� Evolution"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "��สอ� Evolution"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "อ����ระ�อ���สอ� Evolution"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "ยื�ยั��ัว�ุ��ล���าร��ื�อม��อ��ยั���ิร���วอร��ร�อ��ี"
@@ -19945,43 +19219,59 @@ msgid "Default sidebar width"
 msgstr "�วาม�ว�า������า���ย�ริยาย"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window X coordinate"
+msgstr "�ิ�ั� X �ริยาย�อ�ห��า��า�หลั�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window Y coordinate"
+msgstr "�ิ�ั� Y �ริยาย�อ�ห��า��า�หลั�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "�วามสู�ห��า��า���ย�ริยาย"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "ส�า�ะ�อ�ห��า��า���ย�ริยาย"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "�วาม�ว�า��อ�ห��า��า���ย�ริยาย"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "��ิ�����หม��ร����ว�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "��ิ������า�ั���ร�อ��ี�มื�อ�ิ���อ HTTP/HTTP �ิรภัย ��อิ���อร�����"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "��ล����ิ�����าร�ิ���อ�ู�������ย��ย�อมา��"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "�ื�อ�ฮส���ร�อ��ี� HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "รหัส��า��ร�อ��ี HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "�อร���ร�อ��ี HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "�ื�อ�ู�����ร�อ��ี HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID หรือ�ื�อ�ล���อ�อ����ระ�อ��ี��ะ�ส����ย�ริยาย�มื�อ�ริ�ม��ร��รม"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19992,44 +19282,62 @@ msgstr ""
 "apps/evolution/shell/network_config/authentication_user\" �อ� GConf "
 "�ละรหัส��า��ะ�ึ�มา�า� gnome-keyring หรือ�ม������มรหัส��า� ~/.gnome2_private/Evolution"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Initial attachment view"
+msgstr "มุมมอ����ม����ริ�ม�ร�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Initial file chooser folder"
+msgstr "��ล��อร��ริ�ม�ร��อ��ล�อ��ลือ����ม"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "��ล��อร��ริ�ม�ร��อ��ล�อ�����อ� GtkFileChooser"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "มุมมอ��ริ�ม�ร�สำหรั�วิ�����������ม��� \"0\" �ือมุมมอ��อ�อ�, \"1\" �ือมุมมอ�ราย�ื�อ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "รุ��ล�าสุ��อ��าร�รั�รุ����า�ั��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ราย�ื�อ�า��อ���ล��อร��ี��ะ�รั���อมูลล��ิส���ห��ร��ั� ��ื�อ����า����ออ��ล��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "�ฮส���ี��ม�����ร�อ��ี"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "รหัส��า��ี��ะส����ื�อยื�ยั��ัว�ุ��ล�มื�อ�ะ����ร�อ��ี HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "�หม��าร�ั����า�ร�อ��ี"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "�ื�อ�ฮส���ร�อ��ี SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "�อร���ร�อ��ี SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "�ื�อ�ฮส���ร�อ��ี HTTP �ิรภัย"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "�อร���ร�อ��ี HTTP �ิรภัย"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20040,41 +19348,49 @@ msgstr ""
 "\", \"�ม�����ร�อ��ี\", \"����าร�ั����า�ร�อ��ี����ำห���อ�\" �ละ \"����าร�ั����า�ี�����า� URL "
 "��า�ั��อั���มั�ิ\" �ามลำ�ั�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "�ส�������า�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "��าม�ล�อ�����อ���ือ�ส�า�ะ�ำลั��ั��า"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "�ริ�ม���หม�ออ��ล��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "�ส�����ส�า�ะ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "รุ���อ���า�ั���อ� Evolution ��รู���� รุ���ห��.รุ��ย�อย.ระ�ั���า�ั�� (���� \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The default X coordinate for the main window."
+msgstr "�ิ�ั� X �ริยาย�อ�ห��า��า�หลั�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "The default Y coordinate for the main window."
+msgstr "�ิ�ั� Y �ริยาย�อ�ห��า��า�หลั�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "�วามสู��ริยาย�อ�ห��า��า�หลั� �����ิ���ล"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า�หลั� �����ิ���ล"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "�วาม�ว�า��ริยาย�อ������า� �����ิ���ล"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20082,19 +19398,19 @@ msgstr ""
 "รุ��ล�าสุ��อ��าร�รั�รุ����า�ั���อ� Evolution ��รู���� รุ���ห��.รุ��ย�อย.ระ�ั���า�ั�� (���� \"2.6.0"
 "\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "�ื�อ��รื�อ��ี��ะ��������ร�อ��ี HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "�ื�อ��รื�อ��ี��ะ��������ร�อ��ี HTTP �ิรภัย"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "�ื�อ��รื�อ��ี��ะ��������ร�อ��ี socks"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20102,7 +19418,7 @@ msgstr ""
 "�อร���อ���รื�อ��ี��ำห����ย \"/apps/evolution/shell/network_config/http_host\" "
 "�ี��ุ���������ร�อ��ี"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20110,7 +19426,7 @@ msgstr ""
 "�อร���อ���รื�อ��ี��ำห����ย \"/apps/evolution/shell/network_config/secure_host\" "
 "�ี��ุ���������ร�อ��ี"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20118,7 +19434,7 @@ msgstr ""
 "�อร���อ���รื�อ��ี��ำห����ย \"/apps/evolution/shell/network_config/socks_host\" "
 "�ี��ุ���������ร�อ��ี"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20127,7 +19443,7 @@ msgstr ""
 "รู�����อ��ุ�มห��า��า� สามาร����� \"text\", \"icons\", \"both\" หรือ \"toolbar\" "
 "��า�ำห������ \"toolbar\" รู�����อ��ุ�ม�ะ�ำห����ย��า�ั�������รื�อ�มือ�อ� GNOME"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20138,148 +19454,200 @@ msgstr ""
 "(��ย��� wildcard ��ส�ว�ห��า ���� *.foo.com), หมาย�ล��อ�ี (����ั�� IPv4 �ละ IPv6) "
 "หรือ�ี�อยู���รือ��าย�ร�อม�����มส�� (�ัวอย�า����� 192.168.0.0/24)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "�ส�������รื�อ�มือ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "URL �ี���รียม��า�ั���ร�อ��ี�ว��ห�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "����ร�อ��ี HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "�ื�อ�ู�����ี��ะ���ยื�ยั��ัว�ุ��ล�มื�อ�ะ����ร�อ��ี HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "�ำห��ว�า Evolution �ะ�ริ�ม�ำ�า����หม�ออ��ล������หม�ออ��ล��หรือ�ม�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "�ำห��ว�า�ะ�ส��ห��า��า��ยาย���ม�อหรือ�ม�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "�ำห��ว�า�ะ�ส�������า�หรือ�ม�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "�ำห��ว�า�ะ�ส�����ส�า�ะหรือ�ม�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "�ำห��ว�า�ะ�ส�������รื�อ�มือหรือ�ม�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "�ำห��ว�า�ะ��าม�ล�อ�����อ���ือ��มื�อ��� Evolution รุ���ำลั��ั��าหรือ�ม�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "�ำห��ว�า�ะ�ส���ุ�ม��า�� ��ห��า��า�หรือ�ม�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "รู�����อ��ุ�มห��า��า�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "�ส���ุ�มห��า��า�"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>�าร��ื�อม��อ�ี��ำ�า�อยู�</b>"
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "�าร���หา"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "�าร��ื�อม��อ�ี��ำ�า�อยู�"
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "�ั��ึ��าร���หา"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "�ลิ� \"��ล�\" ��ื�อ�ิ��าร��ื�อม��อ�หล�า�ี� �ล�ว��ลี�ย������หม�ออ��ล��"
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: ../shell/e-shell-importer.c:131
-msgid "Choose the type of importer to run:"
-msgstr "�ลือ���ิ��อ��าร�ำ���า�ี��ะ�ำ:"
+#. 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
+msgid "Sho_w:"
+msgstr "�_ส��:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:910
+msgid "Sear_ch:"
+msgstr "_���หา:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:970
+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-importer.c:134
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr "�ลือ����ม�ี��ุ���อ��าร�ำ���ามายั� Evolution �ล�ว�ลือ���ิ��อ����ม�ั��ล�าว�า�ราย�ื�อ"
+#: ../shell/e-shell-switcher.c:466
+msgid "Whether the switcher is visible"
+msgstr "�ำห��ว�า�ะ�ส���ัวสลั�หรือ�ม�"
 
-#: ../shell/e-shell-importer.c:138
-msgid "Choose the destination for this import"
-msgstr "�ลือ��ลาย�า��อ��าร�ำ���า�ี�"
+#: ../shell/e-shell-utils.c:247
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-importer.c:144
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-"Evolution ����รว�สอ���า�ั����า�� ��ื�อ�ำ���า�า���ร��รม��อ���ี�:\n"
-"Pine, Netscape, Elm, iCalendar ����ม�����า�ั���ี�สามาร��ำ���า����ลย\n"
-"��า�ุ���อ��ารลอ��หม�อี��รั�� �รุ�า�ลิ��ุ�ม \"ย�อ��ลั�\"\n"
+#: ../shell/e-shell-utils.c:249
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-importer.c:282
-msgid "F_ilename:"
-msgstr "�ื�อ�_��ม:"
+#: ../shell/e-shell-utils.c:270
+msgid "All Files (*)"
+msgstr "�ุ����มi (*)"
 
-#: ../shell/e-shell-importer.c:287
-msgid "Select a file"
-msgstr "�ลือ����ม"
+#: ../shell/e-shell-view.c:681
+msgid "Switcher Action"
+msgstr "�าร�ระ�ำ�อ��ัวสลั�"
 
-#: ../shell/e-shell-importer.c:296
-msgid "File _type:"
-msgstr "_��ิ����ม:"
+#: ../shell/e-shell-view.c:682
+msgid "The switcher action for this shell view"
+msgstr "�าร�ระ�ำ�อ��ัวสลั�สำหรั�มุมมอ���ลล��ี�"
 
-#: ../shell/e-shell-importer.c:332
-msgid "Import data and settings from _older programs"
-msgstr "�ำ���า��อมูล�ละ��า�ั���า���ร��รม�_��า"
+#: ../shell/e-shell-view.c:697
+msgid "Page Number"
+msgstr "หมาย�ล�ห��า"
 
-#: ../shell/e-shell-importer.c:335
-msgid "Import a _single file"
-msgstr "�ำ���า���ม���ม�_�ียว"
+#: ../shell/e-shell-view.c:698
+msgid "The notebook page number of the shell view"
+msgstr "หมาย�ล�ห��าสมุ��อ�มุมมอ���ลล�"
 
-#: ../shell/e-shell-settings-dialog.c:313
-msgid "Evolution Preferences"
-msgstr "�รั����� Evolution"
+#: ../shell/e-shell-view.c:714
+msgid "Search Rule"
+msgstr "���าร���หา"
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-view.c:715
+msgid "Criteria for the current search results"
+msgstr "��ื�อ���สำหรั��ล�าร���หา�ั��ุ�ั�"
 
-#: ../shell/e-shell-window-commands.c:75
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "�ม�����รื�อ�มือ GNOME Pilot �ิ��ั����ระ��"
+#: ../shell/e-shell-view.c:730
+msgid "The EShellBackend for this shell view"
+msgstr "EShellBackend สำหรั�มุมมอ���ลล��ี�"
 
-#: ../shell/e-shell-window-commands.c:83
-#, c-format
-msgid "Error executing %s."
-msgstr "��ิ���อ�ิ��ลา���ะ�รีย���� %s"
+#: ../shell/e-shell-view.c:745
+msgid "Shell Content Widget"
+msgstr "วิ�������ื�อหา��ลล�"
 
-#: ../shell/e-shell-window-commands.c:139
-msgid "Bug buddy is not installed."
-msgstr "�ม�����ิ��ั����รื�อ�มือราย�า��ั�� (bug buddy)"
+#: ../shell/e-shell-view.c:746
+msgid "The content widget appears in a shell window's right pane"
+msgstr "วิ�������ื�อหา�ะ�รา������อ���า��วา�อ�ห��า��า���ลล�"
 
-#: ../shell/e-shell-window-commands.c:142
-msgid "Bug buddy could not be run."
-msgstr "�รีย���รื�อ�มือราย�า��ั�� (bug buddy) �ม�สำ�ร��"
+#: ../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.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "สุ�รา�ี �ีระวั��สุ� <supranee opentle org>\n"
@@ -20288,131 +19656,408 @@ msgstr ""
 "��ามี�วลา��ร�มา��วย�ั���ล :-)\n"
 "http://gnome-th.sf.net";
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "�ว������ Evolution"
 
-#: ../shell/e-shell-window-commands.c:1170
-msgid "_Work Online"
-msgstr "�ำ�า�ออ_��ล��"
+#: ../shell/e-shell-window-actions.c:1224
+msgid "Bug Buddy is not installed."
+msgstr "�ม�����ิ��ั����รื�อ�มือราย�า��ั�� (Bug Buddy)"
+
+#: ../shell/e-shell-window-actions.c:1226
+msgid "Bug Buddy could not be run."
+msgstr "�รีย���รื�อ�มือราย�า��ั�� (Bug Buddy) �ม�สำ�ร��"
+
+#: ../shell/e-shell-window-actions.c:1343
+msgid "GNOME Pilot is not installed."
+msgstr "�ม�����ิ��ั�� GNOME Pilot"
+
+#: ../shell/e-shell-window-actions.c:1345
+msgid "GNOME Pilot could not be run."
+msgstr "�รีย� GNOME Pilot �ม�สำ�ร��"
+
+#: ../shell/e-shell-window-actions.c:1439
+msgid "Show information about Evolution"
+msgstr "�ส����อมูล��ี�ยว�ั� Evolution"
+
+#: ../shell/e-shell-window-actions.c:1444
+msgid "_Close Window"
+msgstr "�ิ_�ห��า��า�"
+
+#: ../shell/e-shell-window-actions.c:1451
+msgid "_Contents"
+msgstr "��ื�อ_หา"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1453
+msgid "Open the Evolution User Guide"
+msgstr "��ิ��ู�มือ�ู�����อ� Evolution"
+
+#: ../shell/e-shell-window-actions.c:1479
+msgid "Evolution _FAQ"
+msgstr "�ำ_�าม�ี��าม��อย��ี�ยว�ั� Evolution"
+
+#: ../shell/e-shell-window-actions.c:1481
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "��ิ��ว��ห��า�ำ�าม�ี��าม��อย"
+
+#: ../shell/e-shell-window-actions.c:1486
+msgid "_Forget Passwords"
+msgstr "_�ิ��รหัส��า�"
+
+#: ../shell/e-shell-window-actions.c:1488
+msgid "Forget all remembered passwords"
+msgstr "�ิ��รหัส��า��ี������ว��ั��หม�"
+
+#: ../shell/e-shell-window-actions.c:1493
+msgid "I_mport..."
+msgstr "�ำ�_��า..."
+
+#: ../shell/e-shell-window-actions.c:1495
+msgid "Import data from other programs"
+msgstr "�ำ���า��อมูล�า���ร��รมอื��"
+
+#: ../shell/e-shell-window-actions.c:1500
+msgid "New _Window"
+msgstr "_ห��า��า��หม�"
+
+#: ../shell/e-shell-window-actions.c:1502
+msgid "Create a new window displaying this view"
+msgstr "��ิ�ห��า��า��หม���ย�ส��มุมมอ��ี�"
+
+#: ../shell/e-shell-window-actions.c:1516
+msgid "Configure Evolution"
+msgstr "�ั����า Evolution"
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "_Quick Reference"
+msgstr "�อ�สาร_อ�า�อิ���ว�"
+
+#: ../shell/e-shell-window-actions.c:1523
+msgid "Show Evolution's shortcut keys"
+msgstr "�ส���ุ�มลั��อ� Evolution"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "Exit the program"
+msgstr "ออ��า���ร��รม"
+
+#: ../shell/e-shell-window-actions.c:1535
+msgid "_Advanced Search..."
+msgstr "_���หา�ั��สู�..."
+
+#: ../shell/e-shell-window-actions.c:1537
+msgid "Construct a more advanced search"
+msgstr "สร�า�ราย�าร���หา�ั��สู��ึ����"
+
+#: ../shell/e-shell-window-actions.c:1544
+msgid "Clear the current search parameters"
+msgstr "ล�า��ารามิ��อร��าร���หา�ั��ุ�ั�"
+
+#: ../shell/e-shell-window-actions.c:1549
+msgid "_Edit Saved Searches..."
+msgstr "�_�����าร���หา�ี��ั��ึ��ว�..."
+
+#: ../shell/e-shell-window-actions.c:1551
+msgid "Manage your saved searches"
+msgstr "�ั��าร�าร���หา�ี��ั��ึ��ว��อ��ุ�"
+
+#: ../shell/e-shell-window-actions.c:1558
+msgid "Click here to change the search type"
+msgstr "�ลิ��ี��ี���ื�อ��ลี�ย���ิ��อ��าร���หา"
+
+#: ../shell/e-shell-window-actions.c:1563
+msgid "_Find Now"
+msgstr "_หา��ี�ยว�ี�"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1565
+msgid "Execute the current search parameters"
+msgstr "�รีย�����ารามิ��อร����หา�ั��ุ�ั�"
+
+#: ../shell/e-shell-window-actions.c:1570
+msgid "_Save Search..."
+msgstr "_�ั��ึ��าร���หา..."
+
+#: ../shell/e-shell-window-actions.c:1572
+msgid "Save the current search parameters"
+msgstr "�ั��ึ��ารามิ��อร����หา�ั��ุ�ั�"
+
+#: ../shell/e-shell-window-actions.c:1584
+msgid "Send / _Receive"
+msgstr "_รั� / ส��"
+
+#: ../shell/e-shell-window-actions.c:1586
+msgid "Send queued items and retrieve new items"
+msgstr "ส����อ�วาม�ี�อยู����ิว�ละ�ึ���อ�วาม�หม�"
+
+#: ../shell/e-shell-window-actions.c:1591
+msgid "Submit _Bug Report..."
+msgstr "ส��_ราย�า��ุ����ร�อ�..."
+
+#: ../shell/e-shell-window-actions.c:1593
+msgid "Submit a bug report using Bug Buddy"
+msgstr "ส��ราย�า��ุ����ร�อ���วย��รื�อ�มือราย�า��ั��"
+
+#: ../shell/e-shell-window-actions.c:1598
+msgid "GNOME Pilot _Synchronization..."
+msgstr "�าร_�รั���อมูล�ห��ร��ั� GNOME Pilot..."
+
+#: ../shell/e-shell-window-actions.c:1600
+msgid "Set up GNOME Pilot configuration"
+msgstr "�ั����า GNOME Pilot"
+
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Offline"
 msgstr "�ำ�า�ออ_��ล��"
 
-#: ../shell/e-shell-window-commands.c:1196
-msgid "Work Offline"
-msgstr "�ำ�า�ออ��ล��"
+#: ../shell/e-shell-window-actions.c:1607
+msgid "Put Evolution into offline mode"
+msgstr "�ำ Evolution ���าสู��หม�ออ��ล��"
 
-#: ../shell/e-shell-window.c:377
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"Evolution �ำลั�ออ��ล��อยู�\n"
-"���ุ�ม�ี���า��อ��าร�ห�ออ��ล��"
+#: ../shell/e-shell-window-actions.c:1612
+msgid "_Work Online"
+msgstr "�ำ�า�ออ_��ล��"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution �ำลั���ลี�ย��าร�ำ�า�����ออ��ล��"
+#: ../shell/e-shell-window-actions.c:1614
+msgid "Put Evolution into online mode"
+msgstr "�ำ Evolution ���าสู��หม�ออ��ล��"
 
-#: ../shell/e-shell-window.c:391
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr ""
-"Evolution �ำลั�ออ��ล��อยู�\n"
-"���ุ�ม�ี���า��อ��าร�ห�ออ��ล��"
+#: ../shell/e-shell-window-actions.c:1642
+msgid "Lay_out"
+msgstr "�าร_�ั�วา�"
+
+#: ../shell/e-shell-window-actions.c:1649
+msgid "_New"
+msgstr "สร�า��_หม�"
+
+#: ../shell/e-shell-window-actions.c:1656
+msgid "_Search"
+msgstr "_���หา"
+
+#: ../shell/e-shell-window-actions.c:1663
+msgid "_Switcher Appearance"
+msgstr "รู�����อ�_�ุ�ม�ลือ�"
+
+#: ../shell/e-shell-window-actions.c:1677
+msgid "_Window"
+msgstr "_ห��า��า�"
+
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show Side _Bar"
+msgstr "�ส�����_��า�"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show the side bar"
+msgstr "�ส�������า�"
+
+#: ../shell/e-shell-window-actions.c:1714
+msgid "Show _Buttons"
+msgstr "�ส���ุ�_ม"
+
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Show the switcher buttons"
+msgstr "�ส���ุ�ม�อ��ัวสลั�"
+
+#: ../shell/e-shell-window-actions.c:1722
+msgid "Show _Status Bar"
+msgstr "�ส�����_ส�า�ะ"
+
+#: ../shell/e-shell-window-actions.c:1724
+msgid "Show the status bar"
+msgstr "�ส�����ส�า�ะ"
+
+#: ../shell/e-shell-window-actions.c:1730
+msgid "Show _Tool Bar"
+msgstr "�ส���_����รื�อ�มือ"
+
+#: ../shell/e-shell-window-actions.c:1732
+msgid "Show the tool bar"
+msgstr "�ส�������รื�อ�มือ"
+
+#: ../shell/e-shell-window-actions.c:1754
+msgid "_Icons Only"
+msgstr "�_อ�อ����า�ั��"
+
+#: ../shell/e-shell-window-actions.c:1756
+msgid "Display window buttons with icons only"
+msgstr "�ส���ุ�มห��า��า���วย�อ�อ����า�ั��"
+
+#: ../shell/e-shell-window-actions.c:1761
+msgid "_Text Only"
+msgstr "_��อ�วาม���า�ั��"
+
+#: ../shell/e-shell-window-actions.c:1763
+msgid "Display window buttons with text only"
+msgstr "�ส���ุ�มห��า��า���วย��อ�วาม���า�ั��"
+
+#: ../shell/e-shell-window-actions.c:1768
+msgid "Icons _and Text"
+msgstr "�อ�อ��_ละ��อ�วาม"
+
+#: ../shell/e-shell-window-actions.c:1770
+msgid "Display window buttons with icons and text"
+msgstr "�ส���ุ�มห��า��า���วย�อ�อ��ละ��อ�วาม"
+
+#: ../shell/e-shell-window-actions.c:1775
+msgid "Tool_bar Style"
+msgstr "รู��_�������รื�อ�มือ"
+
+#: ../shell/e-shell-window-actions.c:1777
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "�ส���ุ�ม�ลือ�ห��า��า���ย�����า�ั����ียว�ั������รื�อ�มือ"
+
+#: ../shell/e-shell-window-actions.c:1785
+msgid "Define Views..."
+msgstr "�ำห��มุมมอ�..."
+
+#: ../shell/e-shell-window-actions.c:1787
+msgid "Create or edit views"
+msgstr "สร�า�หรือ�����มุมมอ�"
+
+#: ../shell/e-shell-window-actions.c:1792
+msgid "Save Custom View..."
+msgstr "�ั��ึ�มุมมอ��ำห���อ�..."
+
+#: ../shell/e-shell-window-actions.c:1794
+msgid "Save current custom view"
+msgstr "�ั��ึ�มุมมอ��ำห���อ��ั��ุ�ั�"
+
+#: ../shell/e-shell-window-actions.c:1801
+msgid "C_urrent View"
+msgstr "มุมมอ�_�ั��ุ�ั�"
+
+#: ../shell/e-shell-window-actions.c:1811
+msgid "Custom View"
+msgstr "มุมมอ��ำห���อ�"
 
-#: ../shell/e-shell-window.c:785
+#: ../shell/e-shell-window-actions.c:1813
+msgid "Current view is a customized view"
+msgstr "มุมมอ��ั��ุ�ั�����มุมมอ��ี��ำห���อ�"
+
+#: ../shell/e-shell-window-actions.c:1823
+msgid "Change the page settings for your current printer"
+msgstr "��ลี�ย��าร�ั����าห��า�ระ�าษสำหรั���รื�อ��ิม���ั��ุ�ั��อ��ุ�"
+
+#: ../shell/e-shell-window-actions.c:2200
 #, c-format
 msgid "Switch to %s"
 msgstr "��ลี�ย����ี�%s"
 
-#: ../shell/e-shell.c:640
-msgid "Unknown system error."
-msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ�อ�ระ��"
+#: ../shell/e-shell-window-actions.c:2413
+msgid "Execute these search parameters"
+msgstr "�รีย�����ารามิ��อร����หา�หล�า�ี�"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:571
 #, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
-msgid "OK"
-msgstr "OK"
+#: ../shell/e-shell-window.c:366
+msgid "New"
+msgstr "สร�า��หม�"
 
-#: ../shell/e-shell.c:1263
-msgid "Invalid arguments"
-msgstr "อาร��ิว�ม����ิ��ลา�"
+#: ../shell/e-shell-window.c:616
+msgid "Active Shell View"
+msgstr "มุมมอ���ลล��ี��ำ�า�อยู�"
 
-#: ../shell/e-shell.c:1265
-msgid "Cannot register on OAF"
-msgstr "�ม�สามาร�ล��ะ��ีย��ั� OAF"
+#: ../shell/e-shell-window.c:617
+msgid "Name of the active shell view"
+msgstr "�ื�อ�อ�มุมมอ���ลล��ี��ำ�า�อยู�"
 
-#: ../shell/e-shell.c:1267
-msgid "Configuration Database not found"
-msgstr "�ม����า���อมูล��า�ั��"
+#: ../shell/e-shell-window.c:632
+msgid "The shell window's EFocusTracker"
+msgstr "EFocusTracker �อ�ห��า��า���ลล�"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
-msgid "New"
-msgstr "สร�า��หม�"
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
+msgid "Geometry"
+msgstr "�ร�า��ิ�"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "New Test"
-msgstr "�าร��สอ��หม�"
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
+msgid "Initial window geometry string"
+msgstr "��อ�ำห���ร�า��ิ��ริ�ม�ร��อ�ห��า��า�"
 
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "_��สอ�"
+#: ../shell/e-shell-window.c:662
+msgid "Safe Mode"
+msgstr "�หม��ลอ�ภัย"
 
-#: ../shell/test/evolution-test-component.c:107
-msgid "Create a new test item"
-msgstr "สร�า�ราย�าร��สอ��หม�"
+#: ../shell/e-shell-window.c:663
+msgid "Whether the shell window is in safe mode"
+msgstr "ระ�ุว�าห��า��า���ลล�อยู����หม��ลอ�ภัยหรือ�ม�"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "�� \"�ำ���า\" ��ื�อ�ริ�ม�ำ���า���มมายั� Evolution"
+#: ../shell/e-shell-window.c:694
+msgid "Sidebar Visible"
+msgstr "�ส�������า�"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "�ัว��วย�ำ���า��อมูล�อ� Evolution"
+#: ../shell/e-shell-window.c:695
+msgid "Whether the shell window's side bar is visible"
+msgstr "�ำห��ว�า�ะ�ส�������า���ห��า��า���ลล�หรือ�ม�"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "�ำ���า���ม"
+#: ../shell/e-shell-window.c:709
+msgid "Switcher Visible"
+msgstr "�ส���ัวสลั�"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "�ำ�ห����ี��ะ�ำ���า"
+#: ../shell/e-shell-window.c:710
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "�ำห��ว�า�ะ�ส���ุ�ม��า�� �อ��ัวสลั���ห��า��า���ลล�หรือ�ม�"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "��ิ��อ��าร�ำ���า"
+#: ../shell/e-shell-window.c:725
+msgid "Taskbar Visible"
+msgstr "�ส������า�"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "�ลือ���อมูล�ี��ะ�ห��ำ���า"
+#: ../shell/e-shell-window.c:726
+msgid "Whether the shell window's task bar is visible"
+msgstr "�ำห��ว�า�ะ�ส������า��อ�ห��า��า���ลล�หรือ�ม�"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "�ลือ����ม"
+#: ../shell/e-shell-window.c:741
+msgid "Whether the shell window's tool bar is visible"
+msgstr "�ำห��ว�า�ะ�ส�������รื�อ�มือ�อ�ห��า��า���ลล�หรือ�ม�"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"ยิ��ี��อ�รั�สู��ัว��วย�ำ���า��อมูล�อ� Evolution\n"
-"�ัว��วย�ี��ะ�ำ�ุ�สู��ั���อ���า�� �อ��าร�ำ��อมูล�า����มภาย�อ�\n"
-"���าสู� Evolution"
+#: ../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
+msgid "Preparing to go offline..."
+msgstr "�ำลั���รียม���าสู��หม�ออ��ล��..."
+
+#: ../shell/e-shell.c:262
+msgid "Preparing to go online..."
+msgstr "�ำลั���รียม���าสู��หม�ออ��ล��..."
+
+#: ../shell/e-shell.c:330
+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:221
+#: ../shell/main.c:168
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20446,7 +20091,7 @@ msgstr ""
 "�ราหวั�ว�า�ุ��ะ�ึ��อ���ั��ล�อ��าร�ำ�า�อย�า�ห�ั��อ��รา\n"
 "�ละ�รา�ำลั�รอ�อย�ารร�วมสม���อ��ุ�อย�า���������อ!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:192
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20454,43 +20099,59 @@ msgstr ""
 "�อ�อ��ุ�\n"
 "�ีม�า� Evolution\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:199
 msgid "Do not tell me again"
 msgstr "�ม���อ��อ��ั�อี�"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "�รีย� Evolution ��ย��ิ����อ����ระ�อ��ี��ำห��"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:324
+msgid "Apply the given geometry to the main window"
+msgstr "�����อ�ำห���ร�า��ิ��ี�ระ�ุ�ั�ห��า��า�หลั�"
+
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "�ริ�ม�ำ�า����หม�ออ��ล��"
 
-#: ../shell/main.c:488
-msgid "Forcibly shut down all Evolution components"
-msgstr "�ั��ั��ิ�อ����ระ�อ��ั��หม��อ� Evolution"
+#: ../shell/main.c:330
+msgid "Start in \"express\" mode"
+msgstr "�ริ�ม�ำ�า����หม� \"�ร����ว�\""
 
-#: ../shell/main.c:492
+#: ../shell/main.c:333
+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:495
+#: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
 msgstr "ส����อ�วาม�ี�ั���อ��ุ�อ����ระ�อ�ล����ม"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:342
 msgid "Disable loading of any plugins."
 msgstr "�ิ��าร�หล��ลั��อิ����"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "�ม������อ��ส���ัวอย�า�สำหรั��มล, �ี�อยู��ิ���อ �ละภาร�ิ�"
+msgstr "�ม������อ��ส���ัวอย�า�สำหรั��มล, �ู��ิ���อ �ละภาร�ิ�"
+
+#: ../shell/main.c:348
+msgid "Import URIs or file names given as rest of arguments."
+msgstr "�ำ���า URI หรือ�ื�อ���ม�าม�ี�ระ�ุมา��อาร��ิว�ม����ี��หลือ�ั��หม�"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:350
+msgid "Request a running Evolution process to quit"
+msgstr "ร�อ��อ�ห��ิ���ร��ส Evolution �ี��ำ�า�อยู�"
+
+#: ../shell/main.c:465
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution: ��ร��รม�ั��าร��อมูลส�ว��ุ��ล�ละ��ล�อ���อี�มล"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:491
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20504,36 +20165,28 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "�ุ������หรือ�ม�ว�า��อ��าร�ิ��รหัส��า��ี������ว��ั��หม�?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "�ม�สามาร��ริ�ม�าร�ำ�า��อ� Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "��อ��"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "ล���อมูล���า�า�รุ�� {0} หรือ�ม�?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution �ริ�ม�ำ�า��ม�สำ�ร��"
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr "�าร�ิ��รหัส��า��ี� �ะล�รหัส��า��ุ�รหัส�ี��ำ�ว��ั��หม� �ละ�ะ�ามรหัส��า��ุ��หม����รั����อ��"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "�ี�ว�า����ิส���ม���ีย��อสำหรั��าร�รั�����รุ���หม�"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "ล���อมูล���า�ริ�หรือ�ม�?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20547,14 +20200,14 @@ msgid ""
 msgstr ""
 "��ื�อหา�ั��หม��อ����ร��อรี &quot;evolution&quot; �ำลั��ะ�ู�ล��ิ��อย�า��าวร\n"
 "\n"
-"�อ��ะ�ำว�า �ุ��วร�รว�สอ��ห�������สีย��อ� ว�า��อมูล�มล �ี�อยู��ิ���อ "
+"�อ��ะ�ำว�า �ุ��วร�รว�สอ��ห�������สีย��อ� ว�า��อมูล�มล �ู��ิ���อ "
 "�ละ��ิ�ิ��อ��ุ�ยั�อยู��ร��ั��หม� �ละ Evolution รุ���ี��ำ�า�อย�า��ู���อ� "
 "��อ��ี��ะล���อมูล���า�หล�า�ี�\n"
 "\n"
 "�มื�อล��ล�ว �ุ��ะ�ม�สามาร��รั�รุ���อ� Evolution �ลั�ล�มา����รุ�����า��ยอั���มั�ิ "
 "��ย�ม���อ���ล�สิ����า�� ��วย�ัว�อ����อี���อ��\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20569,11 +20222,11 @@ msgstr ""
 "�ะ�ู�ล��ิ��อย�า��าวร ��า�ุ��ลือ��ี��ะ������อมูล�ุ��ี��ว� �ุ�ยั�สามาร�ล����ร��อรี &quot;"
 "evolution&quot; ��วย�ัว�อ���ภายหลั�����ามสะ�ว�\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
-msgstr "�าร�รั�รุ���า�รุ����อ��ม�สำ�ร��: {0}"
+#: ../shell/shell.error.xml.h:18
+msgid "Upgrade from previous version failed:"
+msgstr "�รั�รุ���า�รุ����อ��ม�สำ�ร��:"
 
-#: ../shell/shell.error.xml.h:21
+#: ../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"
@@ -20585,54 +20238,111 @@ msgstr ""
 "\n"
 "�ุ��ำ������อ�หา��ื�อ�ี�ว�า�มา��ว�า�ี������ร��อรี��า��อ��ุ� ��อ��ี��ะ�ำ��ิ��าร��อ��"
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"��า�ั��ระ���อ��ุ��ม��ร��ั���า�ั���อ� Evolution\n"
-"\n"
-"�ลิ�วิ�ี�����ื�อ�ูรายละ�อีย�"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"��า�ั��ระ���อ��ุ��ม��ร��ั���า�ั���อ� Evolution\n"
-"\n"
-"{0}\n"
-"\n"
-"�ลิ�วิ�ี�����ื�อ�ูรายละ�อีย�"
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "_�ิ��รหัส��า�"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "�_�����อมูล�ว�"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "�_�ือ�อี��ราวห��า"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
-"{1}\n"
+"{0}\n"
 "\n"
 "��า�ุ��ลือ��ี��ะ�ำ��ิ��าร��อ �ุ�อา��ม�สามาร������อมูล���า�า�ส�ว��อ��ุ����อี�\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../shell/test/e-test-shell-backend.c:60
+msgctxt "New"
+msgid "_Test Item"
+msgstr "ราย�าร_��สอ�"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "สร�า�ราย�าร��สอ�ราย�าร�หม�"
+
+#: ../shell/test/e-test-shell-backend.c:70
+msgctxt "New"
+msgid "Test _Source"
+msgstr "�ห_ล����สอ�"
+
+#: ../shell/test/e-test-shell-backend.c:72
+msgid "Create a new test source"
+msgstr "สร�า��หล����สอ��หล���หม�"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "���ม�ี��ม�������ม .desktop �ี�������"
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "�ม�รู��ั����ม��ส����อ�รุ�� '%s'"
+
+#: ../smclient/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "�ำลั��ริ�ม %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "��ร��รม�ม�รั��อ�สาร���รร�ั��ำสั��"
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "�ม�รู��ั��ัว�ลือ��อ��าร�รีย���ร��รม: %d"
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "�ม�สามาร�ส�� URI �อ��อ�สาร��ยั�ราย�าร��ส����อ��ี�มี 'Type=Link'"
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "�ม����ราย�าร�ี��รีย��ำ�า����"
+
+#: ../smclient/eggsmclient.c:227
+msgid "Disable connection to session manager"
+msgstr "�ิ�����าร��ื�อม��อ��ยั���ร��รม�ั��ารวาระ"
+
+#: ../smclient/eggsmclient.c:230
+msgid "Specify file containing saved configuration"
+msgstr "ระ�ุ���ม�ี��ั��ึ���า�ั���ว�"
+
+#: ../smclient/eggsmclient.c:230
+msgid "FILE"
+msgstr "FILE"
+
+#: ../smclient/eggsmclient.c:233
+msgid "Specify session management ID"
+msgstr "ระ�ุหมาย�ล��าร�ั��ารวาระ"
+
+#: ../smclient/eggsmclient.c:233
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Session management options:"
+msgstr "�ัว�ลือ���ี�ยว�ั��าร�ั��ารวาระ:"
+
+#: ../smclient/eggsmclient.c:255
+msgid "Show session management options"
+msgstr "�ส���ัว�ลือ���ี�ยว�ั��าร�ั��ารวาระ"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20643,7 +20353,7 @@ msgstr ""
 "\n"
 "�������า�ั���วาม��ื�อ�ือ:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20652,7 +20362,7 @@ msgstr ""
 "��ื�อ��า��ุ���ื�อ�ืออ����รรั�รอ��ึ��ออ���รั�รอ��ี� �ั��ั���ึ����า�ั��ุ���ื�อ�ือ�วาม����อ���รั�รอ��ี���วย "
 "�อ��า��ะมี�ารระ�ุ����อย�า�อื���ี��ี�"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20661,55 +20371,59 @@ msgstr ""
 "��ื�อ��า��ุ��ม���ื�อ�ืออ����รรั�รอ��ึ��ออ���รั�รอ��ี� "
 "�ั��ั���ึ����า�ั��ุ��ม���ื�อ�ือ�วาม����อ���รั�รอ��ี���วย �อ��า��ะมี�ารระ�ุ����อย�า�อื���ี��ี�"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "�ลือ���รั�รอ��ี��ะ�ำ���า"
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "���ม PKCS12 �ั��หม�"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "�ุ����ม"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "�ื�อ��รั�รอ�"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "�ุ��ระส���"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "หมาย�ล�ลำ�ั�"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "หม�อายุ"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "���ม��รั�รอ�อี�มล�ั��หม�"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "�ี�อยู�อี�มล"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "���ม��รั�รอ� CA �ั��หม�"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1050
+msgid "Certificates"
+msgstr "��รั�รอ�"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "��รื�อ�มือ�ู��รั�รอ�: %s"
@@ -20729,7 +20443,7 @@ msgid "Enter new password"
 msgstr "��อ�รหัส��า��หม�"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20738,7 +20452,7 @@ msgstr ""
 "ออ��ห��ั�:\n"
 "   �รื�อ�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20747,59 +20461,27 @@ msgstr ""
 "ออ��ห���ย:\n"
 "    �รื�อ�: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "�ลือ���รั�รอ�"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<�ม����ส�ว�ห�ึ���อ���รั�รอ�>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>�����อมูล��รั�รอ�</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>ลำ�ั��ั����รั�รอ�</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>��า�อ������อมูล</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>ลาย�ิ�วมือ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>ออ��ห���ย</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>ออ��ห��ั�</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>��รั�รอ��ี���า��าร�รว�สอ��ล�วสำหรั��าร����า���อ���ี�:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>อายุ����า�</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "อ����ร"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "สำรอ�"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "สำรอ��ั��หม�"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../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)."
@@ -20807,1631 +20489,339 @@ msgstr ""
 "��อ��ี��ะ��ื�อ�ือ CA �ี���ื�อ�ุ��ระส������ �ุ��วร�รว�สอ���รั�รอ��ี� "
 "�ร�อม�ั����ย�าย�ละ�ระ�ว��าร��วย (��ามี)"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "��รั�รอ�"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "�วาม��ื�อ�ืออ����รออ���รั�รอ�"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Fields"
+msgstr "�����อมูล��รั�รอ�"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate Hierarchy"
+msgstr "ลำ�ั��ั����รั�รอ�"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "รายละ�อีย���รั�รอ�"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "�ารา���รั�รอ�"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "�ื�อสามั� (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "��รั�รอ��อ��ู��ิ���อ"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "�ม���ื�อ�ือ�วาม����อ���รั�รอ��ี�"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "ห��า��า�หุ�����า�ั��"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "�����"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "��า�ั���วาม��ื�อ�ือ��รั�รอ�อี�มล"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "��รั�รอ��ู�รั�อี�มล"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "��รั�รอ��ู������ำ�ั�อี�มล"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "หม�อายุ"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "Field Value"
+msgstr "��า�อ������อมูล"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Fingerprints"
+msgstr "ลาย�ิ�วมือ"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "�ำ���า"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued By"
+msgstr "ออ��ห���ย"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "ออ��ห��มื�อ"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Issued To"
+msgstr "ออ��ห��ั�"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "ลาย�ิ�วมือ MD5"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "อ����ร (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "ห��วย�า�อ����ร (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "ลาย�ิ�วมือ SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "��รั�รอ�ลู���าย SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "��รั�รอ��ม���าย SSL"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "This certificate has been verified for the following uses:"
+msgstr "��รั�รอ��ี���า��าร�รว�สอ��ล�วสำหรั��าร����า���อ���ี�:"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "��ื�อ�ือ�วาม����อ���รั�รอ��ี�"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "��ื�อ�ือ CA �ี����ารระ�ุ�ู����อี�มล"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "��ื�อ�ือ CA �ี����ารระ�ุ�ั��ั��า�อ����วร�"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "��ื�อ�ือ CA �ี����ารระ�ุ�ว������"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+msgid "Validity"
+msgstr "อายุ����า�"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "�ู"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "�ุ�มี��รั�รอ��า�อ����ร��อ���ี��ึ��ระ�ุ�ัว�ุ�:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "�ุ�มี��รั�รอ������ม�ึ��ระ�ุอ����รรั�รอ���อ���ี�:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "�ุ�มี��รั�รอ������ม�ึ��ระ�ุ�ุ��ล��อ���ี�:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "��รั�รอ��อ��ุ�"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "�_�����วาม��ื�อ�ือ CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:654
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "มี��รั�รอ�อยู��ล�ว"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Ey"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "�����ำ�ั�"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "���ารหัสลั�"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "รุ��"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "รุ���ี� 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "รุ���ี� 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "รุ���ี� 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "MD2 �ร�อม�าร���ารหัสลั� RSA �าม PKCS #1"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "MD5 �ร�อม�าร���ารหัสลั� RSA �าม PKCS #1"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "SHA-1 �ร�อม�าร���ารหัสลั� RSA �าม PKCS #1"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "�าร���ารหัสลั� RSA �าม PKCS #1"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "�าร����ุ�����รั�รอ�"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "��ิ���รั�รอ��อ�����ส���"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "�ัวระ�ุ�ุ���อ����รออ���รั�รอ�"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "�ัวระ�ุอ�อ������ (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "�ัวระ�ุอัล�อริ�ึม"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "�ารามิ��อร��อ�อัล�อริ�ึม"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "��อมูล�ุ���สา�าร�ะ�อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "อัล�อริ�ึม�อ��ุ���สา�าร�ะ�อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "�ุ���สา�าร�ะ�อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "��อ�ิ��ลา�: �ม�สามาร��ระมวล�ลส�ว��ยาย"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "�ู������ำ�ั�อ�อ������"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "อ����รออ���รั�รอ� SSL"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "อ����รออ���รั�รอ�อี�มล"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "�าร�����ำ�ั�"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "�ารรั�รอ��วาม���"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "�าร���ารหัสลั��ุ���"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "�าร���ารหัสลั���อมูล"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "�ารยอมรั��ุ���"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "��������ำ�ั���รั�รอ�"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "��������ำ�ั� CRL"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "สำ�ั�มา�"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "�ม�สำ�ั�มา�"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "ส�ว��ยาย"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "อัล�อริ�ึมสำหรั�ลาย������รั�รอ�"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "ออ��ห���ย"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "ID �อ�ลั�ษ���อ��ู�ออ��ห�"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ID �อ�ลั�ษ���อ��ู�รั��ารรั�รอ�"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "��า�อ�ลาย�����อ���รั�รอ�"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "รหัส��า�สำหรั����ม PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "��อ�รหัส��า�สำหรั����ม PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "��รั�รอ��ี��ำ���า"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "�ม�สามาร��รีย���� '%s': %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "�ำลั��ิ� %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "�ุ�สม�ั�ิ_สมุ��ี�อยู�"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "��ลี�ย��ุ�สม�ั�ิ�อ���ล��อร��ี��ลือ�"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "�ั�_ลอ��ี�อยู��ิ���อ�ั��หม���ยั�..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "�ู_�ัวอย�า��ี�อยู��ิ���อ"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "�ั�ลอ�"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "�ั�ลอ��ี�อยู��ิ���อ�ี��ลือ���ยั���ล��อร�อื��"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "�ั�ลอ��ี�อยู��ิ���อ����ล��อร��ี��ลือ���ยั���ล��อร�อื��"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "�ั�ลอ�ส�ว��ี��ลือ�"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "�ั�ลอ���ยั���ล��อร�..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "สร�า���ล��อร�สมุ��ี�อยู��หม�"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "�ั�"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "�ั�ส�ว��ี��ลือ�"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "ล_�สมุ��ี�อยู�"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "ล��ี�อยู��ิ���อ�ี��ลือ�"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "ล���ล��อร��ี��ลือ�"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "ส����อ�ี�อยู��ิ���อ"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "_ย�าย�ี�อยู��ิ���อ�ั��หม���ยั�..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "ย�าย�ี�อยู��ิ���อ�ี��ลือ���ยั���ล��อร�อื��"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "ย�าย�ี�อยู��ิ���อ����ล��อร��ี��ลือ���ยั���ล��อร�อื��"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "ย�าย��ยั���ล��อร�..."
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "��ะ"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "��ะ�า��ลิ��อร��"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "�ส���ัวอย�า��ี�อยู��ิ���อ��อ��ิม��"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "�ิม���ี�อยู��ิ���อ�ี��ลือ�"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "��ลี�ย��ื�อ��ล��อร��ี��ลือ�"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "�ั�_�ึ�สมุ��ี�อยู���รู� VCard"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "�ั��ึ����� VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "�ั��ึ��ี�อยู��ิ���อ�ี��ลือ���รู� VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "�ั��ึ��ี�อยู��ิ���อ�อ���ล��อร��ี��ลือ���รู� VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2725
-msgid "Select All"
-msgstr "�ลือ��ั��หม�"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "�ลือ��ั��_หม�"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "�ลือ��ี�อยู��ิ���อ�ั��หม�"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "ส����อ�วาม��ยั��ี�อยู��ิ���อ�ี��ลือ�อยู�"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "ส����อ�วาม��ยั��ี�อยู��ิ���อ"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "ส���ี�อยู��ิ���อ�ี��ลือ����ห��ู�อื��"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "�ส����อ�ห��า��า��ส���ัวอย�า��ี�อยู��ิ���อ"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "_หยุ�"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "หยุ�"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "หยุ��หล�"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "�ู��อมูล�ี�อยู��ิ���อ�ั��ุ�ั�"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "_��ิ�ั�ิ�าร"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "_�ั�ลอ��ี�อยู��ิ���อ��ยั�..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "_�ั�ลอ��ี�อยู��ิ���อ����ล��อร���ยั�"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "_ล��ี�อยู��ิ���อ"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "ส��_��อ�ี�อยู��ิ���อ..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "_ย�าย�ี�อยู��ิ���อ��ยั�..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "_ย�าย�ี�อยู��ิ���อ����ล��อร���ยั�"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "สร�า��_หม�"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "��ลี�ย�_�ื�อ"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "_�ั��ึ��ี�อยู��ิ���อ��รู� VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "_�ั��ึ��ี�อยู��ิ���อ����ล��อร���รู� VCard"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "_ส����อ�วาม��ยั��ี�อยู��ิ���อ..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "วั�"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "ล�_�ุ�รอ��อ��ั�หมาย�ี�"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "ล��ุ�รอ��อ��ั�หมาย�ี�"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "ล��ั�หมาย"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "ล��ั�หมายรอ��ี�"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "��ยั�"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "ย�อ��ลั�"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "����า�ห��า"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "ราย�าร"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "��ือ�"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
-msgid "Next"
-msgstr "�ั���"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "�ส���ัวอย�า���ิ�ิ���อ��ิม��"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
-msgid "Previous"
-msgstr "��อ�ห��า"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "�ิม����ิ�ิ��ี�"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "�_����วา�"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "ล��ั�หมาย�ละ�าร�ระ�ุม���า�ิ��"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "�ลือ�วั�_�ี�"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "�ลือ�_วั��ี�"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "ระ�ุวั��ี�"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "�ลือ�วั��ี�"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "�ส������ราย�าร"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "�ส��วั���ียว"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "�ส����ือ���ียว"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "�ส��สั��าห���ียว"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "�ส��สั��าห��าร�ำ�า�"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "�ู�ั�หมาย�ั��ุ�ั�"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "�ส���อ���ล�ี�ั����ื�อ�ู��อ�วาม�ั��ึ�"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "สั��าห�"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "สั��าห��ำ�า�"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "�ั��ึ�สำหรั��าร_�ี�ั��:"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "�_�ิ��ั�หมาย"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "ย��ลิ���ิ�ั�ิ�าร�มล�ั��ุ�ั�"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "�ั�ลอ���ล��อร��ี��ลือ���ยั���ล��อร�อื��"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "สร�า���ล��อร��หม�สำหรั��าร�����มล"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "สร�า�หรือ�������อ�ำห��สำหรั���ล��อร����หา"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "สร�า�หรือ�������สำหรั��าร�รอ��มล�หม�"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr "�าว���หล���อ�วามสำหรั��ั��ี/��ล��อร��ี��ำ��รื�อ�หมายออ��ล���ว�"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "��_�ั��ยะ"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "�_�ล��อร�"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "ย�าย��ล��อร��ี��ลือ���ยั���ล��อร�อื��"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "ล���อ�วาม�ี�ล��า��ุ���ล��อร�อย�า��าวร"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "�_�ล��อร����หา"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "�ส��_�ัวอย�า���อ�วาม"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "�ส���ัวอย�า���อ�วาม���ราย�าร��อ�วาม��วย"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "�ส���ัวอย�า���อ�วาม��า�� ราย�าร��อ�วาม��วย"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "�ส��ห��า��า��ส���ัวอย�า���อ�วาม"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "�อ�รั�หรือ�ลิ��อ�รั���อมูล�า���ิร���วอร�ภาย�อ��ห��ั���ล��อร�"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "มุมมอ��_����ั�"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "_�ั�ลอ���ล��อร���ยั�..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "_�าว���หล���อ�วามสำหรั�����า����ออ��ล��"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "�ัว_�รอ���อ�วาม"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "_ย�าย��ล��อร���ยั�..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "�_หม�..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "_�ัวอย�า�"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "�าร_�อ�รั���อมูล..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "มุมมอ���ว_�ั��"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "��ลี�ย��ื�อ�อ���ล��อร��ี�"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "��ลี�ย��ุ�สม�ั�ิ�อ���ล��อร��ี�"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "ยุ�_�ระ�ู��ั��หม�"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "ยุ��ระ�ู���อ�วาม�ั��หม�"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "�ั�ลอ���อ�วาม�ี��ลือ����า�ลิ��อร��"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "�ั���อ�วาม�ี��ลือ����า�ลิ��อร��"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "_�ยาย�ระ�ู��ั��หม�"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "�_����วา�"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "�ยาย�ระ�ู���อ�วาม�ั��หม�"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "��อ���อ�วาม�ี��_ลือ�"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "_��อ���อ�วาม�ี�ล�"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "��อ���อ�วาม�ี�_อ�า��ล�ว"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "��อ���อ�วาม�ี�ล� ����าร�ส����วย�าร�ี���า"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "�ำ�_�รื�อ�หมาย�ุ���อ�วามว�าอ�า��ล�ว"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "�ำ��รื�อ�หมาย�ุ���อ�วาม����ล��อร��ี�ว�าอ�า��ล�ว"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "��ะ��อ�วาม�า��ลิ��อร��"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "�วา���อ�วาม�ั��หม��ี�สั��ล��ว�����ล��อร��ี��ิ��อย�า��าวร"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "ล���ล��อร��ี�อย�า��าวร"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "�รั��ส����ล��อร��หม�"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "�ลือ��ระ�ู�_ย�อย�อ���อ�วาม"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "�ลือ�_�ระ�ู���อ�วาม"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "�ลือ���อ�วาม_�ั��หม�"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "�ลั��าร�ลือ����ลือ���อ�วาม�ี��ม�����ลือ�อยู�"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "�ลือ���อ�วาม�ั��หม��ี�อยู����ระ�ู���ียว�ั���อ�วาม�ี��ลือ�"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "�ลือ���อ�วาม�ั��หม��ี��อ���อ�วาม�ี��ลือ�"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "�ลือ���อ�วาม�ั��หม��ี�มอ��ห��"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "�ส_����อ�วาม�ี���อ��ว�"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "�ส����อ�วาม�ี������อ��ว��ั�ว�ราว"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "��อ���อ�วาม�ั��หม��ี����อ�า��ล�ว�ว��ั�ว�ราว"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "��อ���อ�วาม�ี��ลือ��ั�ว�ราว"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "�รีย���อ�วาม�����ระ�ู�"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "�ั��ลุ�ม�าม_�ระ�ู�"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "_��อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "�_�ิ�ม�ู�ส����สมุ��ี�อยู�"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "_��อ����า�ัว�รอ�"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "��ิ�ม�ู�ส����สมุ��ี�อยู�"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "ส�ว�_หัว�อ���อ�วาม�ั��หม�"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "������าร�รอ��รอ���อ�วาม�ี��ลือ�"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "�รว��มล_�ยะ"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "��ีย�_��อ�วาม�หม�"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "��ีย��มล�อ���ยั��ู�รั��ุ����อ���อ�วาม�ี��ลือ�อยู�"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "��ีย��มล�อ���ยั��มลลิ�ลิส���อ���อ�วาม�ี��ลือ�อยู�"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "��ีย��มล�อ���ยั��ู�ส����อ�วาม�ี��ลือ�อยู�"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "�ั�ลอ���อ�วาม�ี��ลือ���ยั���ล��อร�อื��"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "�ั�ลอ���อ�วาม�ี��ลือ����า�ลิ��อร��"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "สร�า�_��"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "สร�า���ล��อร����หาสำหรั��ู�รั��หล�า�ี�"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "สร�า���ล��อร����หาสำหรั��มลลิ�ลิส���ี�"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "สร�า���ล��อร����หาสำหรั��ู�ส���ี�"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "สร�า���ล��อร����หาสำหรั��ื�อ�รื�อ��ี�"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "สร�า�����ื�อ�รอ���อ�วาม�า��ู�ส���ี�"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "สร�า�����ื�อ�รอ���อ�วาม��ยั��ู�รั��หล�า�ี�"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "สร�า�����ื�อ�รอ���อ�วาม��ยั��มลลิ�ลิส���ี�"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "สร�า�����ื�อ�รอ���อ�วาม��วย�ื�อ�รื�อ��ี�"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "�ั���อ�วาม�ี��ลือ����า�ลิ��อร��"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "ล���า�อั�ษร��อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "�ส����อ�วาม�ี�สำ�ั��ั���"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "�ส����อ�วาม�ั���"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "�ส���ระ�ู��ั���"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "�ส����อ�วาม�ั����ี�ยั��ม�อ�า�"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "�ส����อ�วามสำ�ั���อ�ห��า"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "�ส����อ�วาม��อ�ห��า"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "�ส����อ�วาม�ี�ยั��ม�อ�า���อ�ห��า"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "ส��_��อ����..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "�รอ��ี��_มลลิ�ลิส��..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "�รอ��ี��ู�_ส��..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "�รอ��ี��ื�อ�ู�_รั�..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "�รอ��ี��ื�อ�_รื�อ�..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "�รอ���อ�วาม�ี��ลือ�สำหรั�ส�า�ะ�มล�ยะ"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "�ั����ี���อ�วาม��ื�อ�าม�ระ�ู�"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "�ิ�_�าม�ระ�ู�..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "�ั��ั��ห��หล�รู�ภา����มล HTML �ั��หม�"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "ส����อ��อ�วาม�ี��ลือ���ย������ื�อหา����อ�วาม�ี�ส��"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "ส����อ��อ�วาม�ี��ลือ���ยอ�า��ำ�ู��หมือ��าร�อ�"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "ส����อ��อ�วาม�ี��ลือ���ยั��ู�อื��"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "ส����อ��อ�วาม�ี��ลือ���ยั��ู�อื���������ม���"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "��ิ�ม��า�อั�ษร��อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "�ำ�_�รื�อ�หมาย����"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ���ื�อ�ส��ว�า���อ�า��ล�ว"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า������อ�วามสำ�ั�"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า�����มล�ยะ"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า�ม�����มล�ยะ"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�ายั��ม����อ�า�"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ลือ�ว�า������อ�วาม�ม�สำ�ั�"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "�ำ��รื�อ�หมาย��ื�อล���อ�วาม�ี��ลือ�"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "ย�าย��อ�วาม�ี��ลือ���ยั���ล��อร�อื��"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "��อ�วาม_สำ�ั��ั���"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "_�ระ�ู��ั���"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "��อ�วาม�ี�ยั��ม����อ�า�_�ั���"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "�ม�����ยะ"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "��ิ�ห��า��า�สำหรั��าร��ีย���อ�วาม�มล"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "��ิ���อ�วาม�ี��ลือ���ห��า��า��หม�"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "��ิ���อ�วาม�ี��ลือ���ห��า��า���ีย���หมาย��ื�อ�����"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "��อ�วาม�ี�ยั��ม����อ�า�_��อ�ห��า"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "��ะ��อ�วาม�ี��ลือ��า��ลิ��อร��"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "��ะ_�ระ�าศ��ยั���ล��อร�"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "��ะ�ระ�าศ�อ_�"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "��ะ�ระ�าศ��ยั���ล��อร�สา�าร�ะ"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "��ะ�ระ�าศ�อ���อ�วาม����ล��อร�สา�าร�ะ"
-
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Pr_evious Important Message"
-msgstr "��อ�วามสำ�ั�_��อ�ห��า"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Preview the message to be printed"
-msgstr "�ู�ัวอย�า���อ�วาม��อ��ิม��"
-
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Print this message"
-msgstr "�ิม����อ�วาม�ี�"
-
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Re_direct"
-msgstr "��ลี�ย��_ส���า�"
-
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "��ลี�ย��ส���า� (bounce) ��อ�วาม�ี��ลือ���ยั��ู�อื��"
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reset the text to its original size"
-msgstr "�ั����า�อั�ษร��อ�วาม�ลั�����า��ิม"
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the selected messages as a text file"
-msgstr "�ั��ึ���อ�วาม�ี��ลือ�ล��������ม��อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search Folder from Mailing _List..."
-msgstr "สร�า���ล��อร����หา�า��_มลลิ�ลิส��..."
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipien_ts..."
-msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_รั�..."
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Search Folder from S_ubject..."
-msgstr "สร�า���ล��อร����หา�า��ื�อ�_รื�อ�..."
-
-#: ../ui/evolution-mail-message.xml.h:89
-msgid "Search Folder from Sen_der..."
-msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_ส��..."
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Search for text in the body of the displayed message"
-msgstr "���หา��อ�วาม���ัว��อ�วาม�ี��ส��อยู�"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Select _All Text"
-msgstr "�ลือ���ื�อ�วาม�ั��_หม�"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Select all the text in a message"
-msgstr "�ลือ���ื�อ�วาม�ั��หม�����อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "�ำห���าร�ั����าสำหรั���รื�อ��ิม���ั��ุ�ั��อ��ุ�"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "�ส����อร���อร��ะ�ริ�����ื�อ�วาม�อ���อ�วาม�ี��ส��"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages with all email headers"
-msgstr "�ส����อ�วาม�ร�อม��วยส�ว�หัว�อ�อี�มล�ั��หม�"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show the raw email source of the message"
-msgstr "�ส����อมูล�ิ��อ�อี�มล�อ���อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Undelete the selected messages"
-msgstr "�รีย��ื���อ�วามล��ล�ว�ี��ลือ�"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "Uni_mportant"
-msgstr "�_ม�สำ�ั�"
-
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Zoom _Out"
-msgstr "�ยาย_ออ�"
-
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "_Attached"
-msgstr "�_��"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Caret Mode"
-msgstr "����_�อร���อร�"
-
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Clear Flag"
-msgstr "_ล�า���"
-
-#: ../ui/evolution-mail-message.xml.h:105
-msgid "_Delete Message"
-msgstr "_ล���อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Find in Message..."
-msgstr "_หา����อ�วาม..."
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Flag Completed"
-msgstr "_�ั���ว�า�สร���ล�ว"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Go To"
-msgstr "��_ยั�"
-
-#: ../ui/evolution-mail-message.xml.h:111
-msgid "_Important"
-msgstr "_สำ�ั�"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "�_���อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Junk"
-msgstr "�มล_�ยะ"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Load Images"
-msgstr "�_หล�ภา�"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Message Source"
-msgstr "��อมูล_�ิ��อ���อ�วาม"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Next Message"
-msgstr "��อ�วาม_�ั���"
-
-#: ../ui/evolution-mail-message.xml.h:119
-msgid "_Normal Size"
-msgstr "��า�_���ิ"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Not Junk"
-msgstr "�ม�����มล_�ยะ"
-
-#: ../ui/evolution-mail-message.xml.h:121
-msgid "_Open in New Window"
-msgstr "��ิ���_ห��า��า��หม�"
-
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Previous Message"
-msgstr "��อ�วาม_��อ�ห��า"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Quoted"
-msgstr "อ�า�_�ำ�ู�"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_อ�า��ล�ว"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Save Message..."
-msgstr "_�ั��ึ���อ�วาม..."
-
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "_Undelete Message"
-msgstr "�รีย�_�ื���อ�วาม�ี�ล�"
-
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "_Unread"
-msgstr "_ยั��ม����อ�า�"
-
-#: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_�ยาย"
-
-#: ../ui/evolution-mail-message.xml.h:132
-msgid "_Zoom In"
-msgstr "_�ยาย���า"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "�ิ�"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "�����รื�อ�มือหลั�"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "�ั�ลอ��ั��ึ���อ�วาม�ี��ลือ�"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "�ั��ั��ึ���อ�วาม�ี��ลือ�"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "ล��ั��ึ���วย�ำ�ี��ลือ�"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "��ะ�ั��ึ���วย�ำ�า��ลิ��อร��"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "�ส���ัวอย�า�ราย�าร�ั��ึ���วย�ำ��อ��ิม��"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "�ิม��ราย�าร�ั��ึ���วย�ำ"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "�ู�ั��ึ���วย�ำ�ี��ลือ�"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "�_�ิ��ั��ึ���วย�ำ"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "�ั�ลอ�ภาร�ิ��ี��ลือ�"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "�ั�ภาร�ิ��ี��ลือ�"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "ล�ภาร�ิ��ี��สร���ล�ว"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "ล�ภาร�ิ��ี��ลือ�"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "�ำ�_�รื�อ�หมายว�า�สร���ล�ว"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�า����ภาร�ิ��ี��สร���ล�ว"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "��ะภาร�ิ��า��ลิ��อร��"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "�ส���ัวอย�า�ราย�ารภาร�ิ���อ��ิม��"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "�ิม��ราย�ารภาร�ิ�"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "�ส����อ�ห��า��า��ส���ัวอย�า�ภาร�ิ�"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "_�ัวอย�า�ภาร�ิ�"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "�ูภาร�ิ��ี��ลือ�"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "�_�ิ�ภาร�ิ�"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "��ี�ยว�ั� Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "��ลี�ย��าร�ั����า�อ� Evolution"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "��อ�/�ส�������รื�อ�มือ"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "��ิ�ห��า��า��หม���ย�ส����ล��อร��ี�"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "�ส���ุ�ม�ลือ�ห��า��า���ย�����า�ั����ียว�ั������รื�อ�มือ"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "�ส���ุ�มห��า��า���วย�อ�อ��ละ��อ�วาม"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "�ส���ุ�มห��า��า���วย�อ�อ����า�ั��"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "�ส���ุ�มห��า��า���วย��อ�วาม���า�ั��"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "�ำ_�าม�ี��าม��อย��ี�ยว�ั� Evolution"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "ออ��า���ร��รม"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "ล�รหัส��า��ี��ำ�ว��ิ�� �ล�ว�ามรหัส��า��หม����รั����อ��"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "��อ��ุ�มห��า��า�"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "_�ำ���า..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "�อ�อ��_ละ��อ�วาม"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "�ำ���า��อมูล�า���ร��รมอื��"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "�าร_�ั��รีย�"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "_ห��า��า��หม�"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "��ิ��ว��ห��า�ำ�าม�ี��าม��อย"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "�ั��_ห��า�ระ�าษ..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "_�รั�����"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "รั� / ส��"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "_รั� / ส��"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "ส����อ�วาม�ี�อยู����ิว�ละ�ึ���อ�วาม�หม�"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "�ั����า�าร�ิ���อ�ั� PDA"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "�ส�����_��า�"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "�ส�����_ส�า�ะ"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "�ส���_����รื�อ�มือ"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "�ส����อมูล��ี�ยว�ั� Evolution"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "ส��ราย�า��ุ����ร�อ�"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "ส��_ราย�า��ุ����ร�อ�"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "ส��ราย�า���อ�ิ��ลา���วย��รื�อ�มือราย�า��ั��"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "��ิ�/�ิ�ส�า�ะ�าร�ำ�า�ออ��ล��"
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "_รู���������รื�อ�มือ"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "��อ�/�ส�������า�"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "��อ�/�ส�����ส�า�ะ"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "�ำ�า�ออ_��ล��"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "�_�ี�ยว�ั�"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "_�ิ�ห��า��า�"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "_�ิ��รหัส��า�"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "�ำ_�าม�ี��าม��อย"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "��อ_��ุ�ม"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "�_อ�อ����า�ั��"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "�อ�สาร_อ�า�อิ���ว�"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "_ออ�"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "รู�����อ�_�ุ�ม�ลือ�"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "_�ัว�ลือ��าร sync..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "_��อ�วาม���า�ั��"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "_ห��า��า�"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "�าม_�ริษั�"
@@ -22505,31 +20895,27 @@ msgid "With _Status"
 msgstr "�ส��_ส�า�ะ"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>����วลา</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>�าร_�ลือ�</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "�ลือ�����วลา"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "����วลา"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "�ล�อ��ึ�ล�����สม��ื�อ�ลือ�����วลา"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -22538,456 +20924,472 @@ msgstr ""
 "����ุ�ม�มาส���าย��ื�อ�ยาย�ู�ื���ี��ริ�ว�����ี��ละ�ลือ�����วลา\n"
 "����ุ�ม�มาส��วา��ื�อ�อย�ูภา�รวม"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+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:358
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../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:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:340
+#: ../widgets/menus/gal-define-views-dialog.c:342
 msgid "Define Views"
 msgstr "�ำห��มุมมอ�"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "�ำห��มุมมอ�สำหรั� \"%s\""
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "�ารา�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "วั��ุ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "�ั��ึ�มุมมอ��ั��ุ�ั�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_สร�า�มุมมอ��หม�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "����_��มุมมอ��ี�มีอยู�"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
-msgid "Custom View"
-msgstr "มุมมอ��ำห���อ�"
-
-#: ../widgets/menus/gal-view-instance.c:582
-msgid "Save Custom View"
-msgstr "�ั��ึ�มุมมอ��ำห���อ�"
-
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
-msgid "Define Views..."
-msgstr "�ำห��มุมมอ�..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "มุมมอ�_�ั��ุ�ั�"
-
-#: ../widgets/menus/gal-view-menus.c:328
-#, c-format
-msgid "Select View: %s"
-msgstr "�ลือ�มุมมอ�: %s"
-
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Current view is a customized view"
-msgstr "มุมมอ��ั��ุ�ั�����มุมมอ��ี��ำห���อ�"
-
-#: ../widgets/menus/gal-view-menus.c:377
-msgid "Save Custom View..."
-msgstr "�ั��ึ�มุมมอ��ำห���อ�..."
-
-#: ../widgets/menus/gal-view-menus.c:382
-msgid "Save current custom view"
-msgstr "�ั��ึ�มุมมอ��ำห���อ��ั��ุ�ั�"
-
-#: ../widgets/menus/gal-view-menus.c:396
-msgid "Create or edit views"
-msgstr "สร�า�หรือ�����มุมมอ�"
-
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "�ร��า�"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "�ำห��มุมมอ��หม�"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "�ื�อ�อ�มุมมอ��หม�:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "��ิ��อ�มุมมอ�"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "��ิ��อ�มุมมอ�:"
 
-#: ../widgets/misc/e-attachment-bar.c:1138
-msgid "Attachment Bar"
-msgstr "������ม���"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "_�ริยาย"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "�ม�สามาร�������ม %s: %s"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "�ื�อ�ั��ี"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "�ม�สามาร�������ม %s: �ม�������ม���ิ"
+#: ../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.glade.h:1
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "�ุ�สม�ั�ิ���ม���"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "�ื�อ���ม:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "�ื�อ�_��ม:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
 msgstr "��ิ� MIME:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "�ห��ส�����ม����ี���ยอั���มั�ิ"
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "�ห��_ส�����ม����ี���ยอั���มั�ิ"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "�ม�สามาร��ั�������ื��หลั����"
+
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "�ั������_�ื��หลั�"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "�ม�สามาร�ส�����ม���"
+msgstr[1] "�ม�สามาร�ส�����ม���"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "_ส����ยั�..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "ส�����ม����ี��ลือ���ยั��ห���ี���อ��าร"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "�ำลั��หล�"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "�ำลั��ั��ึ�"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide Attachment _Bar"
+msgstr "��อ��_�����ม���"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+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 "��ิ�ม���ม���"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "A_ttach"
+msgstr "�_��"
+
+#: ../widgets/misc/e-attachment-store.c:604
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "�ั��ึ����ม���"
+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
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "�ั��ึ��ั��ห_ม�"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "�_�ิ�ม���ม���..."
+
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "_��อ�"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "�_ส�����รร�ั�"
+
+#: ../widgets/misc/e-attachment-view.c:639
+#, c-format
+msgid "Open with \"%s\""
+msgstr "��ิ���วย \"%s\""
+
+#: ../widgets/misc/e-attachment-view.c:642
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "��ิ����ม����ี��� %s"
+
+#. To Translators: This text is set as a description of an attached
+#. * 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
+msgid "Attached message"
+msgstr "��อ�วาม�ี����"
+
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+msgid "A load operation is already in progress"
+msgstr "มี�าร�หล�อยู�ระหว�า��ำ��ิ��าร"
+
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+msgid "A save operation is already in progress"
+msgstr "มี�าร�ั��ึ�อยู�ระหว�า��ำ��ิ��าร"
+
+#: ../widgets/misc/e-attachment.c:1920
+#, c-format
+msgid "Could not load '%s'"
+msgstr "�ม�สามาร��หล� '%s'"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load the attachment"
+msgstr "�ม�สามาร��หล����ม���"
+
+#: ../widgets/misc/e-attachment.c:2199
+#, c-format
+msgid "Could not open '%s'"
+msgstr "�ม�สามาร���ิ� '%s'"
+
+#: ../widgets/misc/e-attachment.c:2202
+#, c-format
+msgid "Could not open the attachment"
+msgstr "�ม�สามาร���ิ����ม���"
+
+#: ../widgets/misc/e-attachment.c:2637
+msgid "Attachment contents not loaded"
+msgstr "�ม�����หล���ื�อหา�อ����ม���"
+
+#: ../widgets/misc/e-attachment.c:2713
+#, c-format
+msgid "Could not save '%s'"
+msgstr "�ม�สามาร��ั��ึ� '%s'"
+
+#: ../widgets/misc/e-attachment.c:2716
+#, 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
+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:1267
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Ey"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "��ิ�ิ���ือ�"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3645
-#: ../widgets/text/e-text.c:3646
+#: ../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:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../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:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../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:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:513
+#: ../widgets/misc/e-canvas-background.c:514
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:520
+#: ../widgets/misc/e-canvas-background.c:521
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../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:3070
+#: ../widgets/table/e-table-item.c:2884
 msgid "Minimum width"
 msgstr "�วาม�ว�า���ำสุ�"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../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:3071
+#: ../widgets/table/e-table-item.c:2885
 msgid "Minimum Width"
 msgstr "�วาม�ว�า���ำสุ�"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "�าร�ว����อ�ว�า�"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
-msgid "Now"
-msgstr "��ะ�ี�"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "�วลา��อ�อยู���รู����: %s"
-
-#: ../widgets/misc/e-cell-percent.c:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "��าร�อยละ�ะ��อ�อยู�����ว��ั����� 0 �ึ� 100"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "อาร�ิ�"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "�อล�ิ�"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "ยุ�ร��อ��ลา�"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "�ี�"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "�ีริลลิ�"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "�รี�"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "ฮี�รู"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "�ี��ุ��"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "��าหลี"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "��ย"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "�ุร�ี"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "ยู�ิ����"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "ยุ�ร��ะวั���"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "ยุ�ร��ะวั���, �หม�"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "�ั����ิม"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "�ระยุ���"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "ยู��ร�"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "��าย���วา"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "�ุ�อั��ระ�ี��ม�รู��ั�: %s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "รหัสอั��ระ"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "�ส��ุ�อั��ระ�ี��ะ���"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "อื��� ..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "_รหัสอั��ระ"
-
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "วั��ละ�วลา"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
 msgstr "ราย�าร��อ�วาม��ื�อ��อ���อมูลวั��ี�"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
 msgstr "�ลิ��ี��ุ�ม�ี���ื�อ�ส����ิ�ิ�"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:612
 msgid "Drop-down combination box to select time"
 msgstr "�ล�อ��ึ�ล�����สม��ื�อ�ลือ��วลา"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:684
 msgid "No_w"
 msgstr "_��ะ�ี�"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:690
 msgid "_Today"
 msgstr "_วั��ี�"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:698
+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
+msgctxt "date"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../widgets/misc/e-dateedit.c:1834
 msgid "Invalid Date Value"
 msgstr "วั��ี��ม��ู���อ�"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1878
 msgid "Invalid Time Value"
 msgstr "�วลา�ม��ู���อ�"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "�ยายอยู�"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "ระ�ุว�าวิ�����ยุ�-�ยาย�ยายอยู�หรือ�ม�"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "��อ�วาม�ี���าย�อ�วิ�����ยุ�-�ยาย"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "����ัว�ี��ส�����"
-
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-import-assistant.c:238
 msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr "��า�ลือ� อั��ระ�ี��ส���������อ�วาม�ะระ�ุว�าอั��ระ�ั����ะ�������รหัส�ุ�มลั�"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "��อ�ว�า�ระหว�า���าย�ละวิ�����"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "วิ�������าย"
+"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-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "วิ������ี��ะ����ส���ล�����าย���ิ�อ�วิ�����ยุ�-�ยาย"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "�ื�อ�_��ม:"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "��า��ี��ยาย�ึ��"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "�ลือ����ม"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "��า��อ�ลู�ศรยุ�-�ยาย"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "_��ิ����ม:"
 
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "��อ���รอ�ลู�ศรยุ�-�ยาย"
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "�ลือ��ลาย�า��อ��าร�ำ���า�ี�"
 
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "��อ���รอ�ลู�ศรยุ�-�ยาย"
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "�ลือ���ิ��อ��าร�ำ���า�ี��ะ�ำ:"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:748
-msgid "Advanced Search"
-msgstr "�าร���หา�ั��สู�"
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "�ำ���า��อมูล�ละ��า�ั���า���ร��รม�_��า"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
-msgid "Save Search"
-msgstr "�ั��ึ��าร���หา"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "�ำ���า���ม���ม�_�ียว"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "_Searches"
-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-filter-bar.c:270
-msgid "Searches"
-msgstr "�าร���หา"
+#: ../widgets/misc/e-import-assistant.c:516
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution ����รว�สอ���า�ั����า�� ��ื�อ�ำ���า�า���ร��รม��อ���ี�: Pine, Netscape, Elm, "
+"iCalendar ����ม�����า�ั���ี�สามาร��ำ���า����ลย ��า�ุ���อ��ารลอ��หม�อี��รั�� �รุ�า�ลิ��ุ�ม "
+"\"ย�อ��ลั�\""
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
-msgid "_Save Search..."
-msgstr "_�ั��ึ��าร���หา..."
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "��รื�อ�มือ��วย�ำ���า��อมูล�อ� Evolution"
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
-msgid "_Edit Saved Searches..."
-msgstr "�_�����าร���หา�ี��ั��ึ��ว�..."
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "�ำ�ห����ี��ะ�ำ���า"
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
-msgid "_Advanced Search..."
-msgstr "_���หา�ั��สู�..."
+#: ../widgets/misc/e-import-assistant.c:1207
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"ยิ��ี��อ�รั�สู���รื�อ�มือ��วย�ำ���า��อมูล�อ� Evolution\n"
+"��รื�อ�มือ��วย�ี��ะ�ำ�ุ�สู��ั���อ���า�� �อ��าร�ำ��อมูล�า����มภาย�อ����าสู� Evolution"
 
-#: ../widgets/misc/e-filter-bar.h:107
-msgid "All Accounts"
-msgstr "�ุ��ั��ี"
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "��ิ��อ��าร�ำ���า"
 
-#: ../widgets/misc/e-filter-bar.h:108
-msgid "Current Account"
-msgstr "�ั��ี�ั��ุ�ั�"
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "�ลือ���อมูล�ี��ะ�ห��ำ���า"
 
-#: ../widgets/misc/e-filter-bar.h:109
-msgid "Current Folder"
-msgstr "��ล��อร��ั��ุ�ั�"
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "�ลือ����ม"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "��อ�วาม�ั��ุ�ั�"
+#: ../widgets/misc/e-import-assistant.c:1255
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "�� \"�ริ�ม���\" ��ื�อ�ริ�ม�ำ���า���มมายั� Evolution"
 
-#: ../widgets/misc/e-image-chooser.c:169
-msgid "Choose Image"
-msgstr "�ลือ�รู�ภา�"
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+msgid "Import Data"
+msgstr "�ำ���า��อมูล"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:629
 msgid "World Map"
 msgstr "����ี��ล�"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:631
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22995,441 +21397,531 @@ msgstr ""
 "วิ���������ี��������อ���า��มาส�สำหรั��ลือ�����วลา �ู�����ี���������ิม�� "
 "�วร�ลือ�����วลา�า��ล�อ��ึ�ล�����สม��า�ล�า����"
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "ออ��ล��"
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution �ำลั�ออ��ล��อยู� ���ุ�ม�ี���า��อ��าร�ห�ออ��ล��"
+
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution �ำลั�ออ��ล��อยู� ���ุ�ม�ี���า��อ��าร�ห�ออ��ล��"
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:33
+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-pilot-settings.c:102
+#: ../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 �ั�:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "Sync ระ��ีย���อมูลส�ว��ัว:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "Sync หมว�:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
-msgid "Empty message"
-msgstr "��อ�วามว�า���ล�า"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "�รั����� Evolution"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
-msgid "Reflow model"
-msgstr "�ม��ล��อมูล�าร�ั��รีย��ระ�ส��อ�วาม"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "หา��: %d"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
-msgid "Column width"
-msgstr "�วาม�ว�า��อลัม��"
+#: ../widgets/misc/e-search-bar.c:558
+msgid "Close the find bar"
+msgstr "�ิ�������หา"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Search"
-msgstr "���หา"
+#: ../widgets/misc/e-search-bar.c:566
+msgid "Fin_d:"
+msgstr "_หา:"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Click here to change the search type"
-msgstr "�ลิ��ี��ี���ื�อ��ลี�ย���ิ��อ��าร���หา"
+#: ../widgets/misc/e-search-bar.c:578
+msgid "Clear the search"
+msgstr "ล�า�ราย�าร���หา"
 
-#: ../widgets/misc/e-search-bar.c:603
-msgid "_Search"
-msgstr "_���หา"
+#: ../widgets/misc/e-search-bar.c:601
+msgid "_Previous"
+msgstr "_��อ�ห��า"
 
-#: ../widgets/misc/e-search-bar.c:609
-msgid "_Find Now"
-msgstr "_หา��ี�ยว�ี�"
+#: ../widgets/misc/e-search-bar.c:607
+msgid "Find the previous occurrence of the phrase"
+msgstr "หา�ำ�ห����รา����อ�ห��า�อ�วลี�ี��ำห��"
 
-#: ../widgets/misc/e-search-bar.c:610
-msgid "_Clear"
-msgstr "_ล�า�"
+#: ../widgets/misc/e-search-bar.c:617
+msgid "_Next"
+msgstr "_�ั���"
 
-#: ../widgets/misc/e-search-bar.c:865
-msgid "Item ID"
-msgstr "หมาย�ล�ราย�าร"
+#: ../widgets/misc/e-search-bar.c:623
+msgid "Find the next occurrence of the phrase"
+msgstr "หา�ำ�ห����รา���ั����อ�วลี�ี��ำห��"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
-msgid "Text"
-msgstr "��อ�วาม"
+#: ../widgets/misc/e-search-bar.c:633
+msgid "Mat_ch case"
+msgstr "�ัว_�ิม���ห��-�ล���ร��ั�"
+
+#: ../widgets/misc/e-search-bar.c:661
+msgid "Reached bottom of page, continued from top"
+msgstr "����ายห��า�ล�ว �ริ�มหา�หม��า����"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
-msgid "Sho_w: "
-msgstr "�_ส��: "
-
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
-msgid "Sear_ch: "
-msgstr "_���หา: "
-
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
-msgid " i_n "
-msgstr " �_� "
-
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-search-bar.c:683
+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:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../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:209
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "�าร�รีย�ลำ�ั�"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "�หม��าร�ลือ�"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "�หม��อ���อร���อร�"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "�มื�อ_ล�:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>�ัว�ลือ��ารส��</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>�อ��ลั�</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>�าร�����อ��ลั�</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>�าร�ิ��ามส�า�ะ</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "_ล�ราย�ารส����ยอั���มั�ิ"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "สร�า_�ราย�าร�มลส���ล�ว��ื�อ�ิ��าม��อมูล"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "�ึ��_ล�ว�ละ��ิ��ล�ว"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "�ัว�ลือ��ารส��"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr "�ู�ล�ว�ำลาย"
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "�ัว�ลือ�_�ั�ว��"
 
-#: ../widgets/misc/e-send-options.glade.h:10
-msgid ""
-"None\n"
-"Mail Receipt"
-msgstr ""
-"�ม�มี\n"
-"�ารรั��มล"
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
+msgstr "�����ารรั��มล"
 
-#: ../widgets/misc/e-send-options.glade.h:12
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"���ิ\n"
-"ส�ว��ัว\n"
-"ลั�\n"
-"ลั�มา�\n"
-"ลั��ี�สุ�\n"
-"�ู�ล�ว�ำลาย"
-
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.ui.h:14
+msgid "Proprietary"
+msgstr "ส�ว��ัว"
+
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "_��อ��าร�าร�อ��ลั�"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Return Notification"
+msgstr "�าร�����อ��ลั�"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "�าร�ิ��าม_ส�า�ะ"
 
-#: ../widgets/misc/e-send-options.glade.h:21
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"�ม��ำห��\n"
-"สู�\n"
-"���ิ\n"
-"��ำ"
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Standard"
+msgstr "���ิ"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Status Tracking"
+msgstr "�าร�ิ��ามส�า�ะ"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Top Secret"
+msgstr "ลั��ี�สุ�"
+
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "�มื�อ_ยอมรั�:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "�_มื�อ�สร��สม�ูร��:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "�มื�อ_��ิ�ส�:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "_ภาย��"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "_หลั��า�:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "_��อมูล�ั��หม�"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_Classification:"
+msgstr "�ระ�_ภ�:"
+
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "_ห��ว��ารส����อ�วาม"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "_�ึ��ล�ว"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "_�ำห��วั�หม�อายุ"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "_���ระ�ั��:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "�_มื�อสะ�ว�"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "�มื�อ_��ิ��ล�ว:"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "�ม�มี�ื�อ"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (�สร���ล�ว %d%%)"
+#: ../widgets/misc/e-signature-editor.c:210
+msgid "_Save and Close"
+msgstr "_�ั��ึ��ละ�ิ�"
+
+#: ../widgets/misc/e-signature-editor.c:389
+msgid "Edit Signature"
+msgstr "�����ลาย����"
+
+#: ../widgets/misc/e-signature-editor.c:404
+msgid "_Signature Name:"
+msgstr "_�ื�อลาย����:"
+
+#: ../widgets/misc/e-signature-manager.c:294
+msgid "Add Signature Script"
+msgstr "��ิ�มส�ริ���สำหรั�ลาย����"
+
+#: ../widgets/misc/e-signature-manager.c:359
+msgid "Edit Signature Script"
+msgstr "�����ส�ริ���สำหรั�ลาย����"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "��ิ�ม_ส�ริ���"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"�ลลั����อ�ส�ริ����ี��ะ�ู��������ลาย�����อ��ุ�\n"
+"�ื�อ�ี��ุ��ำห�� �ะ�����ื�อ�ส���มื�ออ�า�อิ��ึ����า�ั��"
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+msgid "S_cript:"
+msgstr "ส_�ริ���:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+msgid "Script file must be executable."
+msgstr "���มส�ริ�����อ�มีอยู� �ละ��อ�สามาร��รีย��ำ�า����"
 
 #: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "�ลิ��ี��ี���ื�อ��ยั� URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "�����ราย�ื�อหมว��ม����..."
+#: ../widgets/misc/e-web-view.c:348
+msgid "_Copy Link Location"
+msgstr "�ั�_ลอ��ี�อยู�ลิ���"
+
+#: ../widgets/misc/e-web-view.c:350
+msgid "Copy the link to the clipboard"
+msgstr "�ั�ลอ�ลิ������า�ลิ��อร��"
+
+#: ../widgets/misc/e-web-view.c:358
+msgid "_Open Link in Browser"
+msgstr "��ิ�ลิ������_�ราว���อร�"
 
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "สิ���ี��ั�อยู���_หมว��ี�:"
+#: ../widgets/misc/e-web-view.c:360
+msgid "Open the link in a web browser"
+msgstr "��ิ�ลิ������ว����ราว���อร�"
 
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "_หมว��ี�มี:"
+#: ../widgets/misc/e-web-view.c:368
+msgid "_Copy Email Address"
+msgstr "_�ั�ลอ��ี�อยู�อี�มล"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "หมว�"
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+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
+#, c-format
+msgid "Click to call %s"
+msgstr "�ลิ���ื�อ�รีย���ยั� %s"
+
+#: ../widgets/misc/e-web-view.c:758
+msgid "Click to hide/unhide addresses"
+msgstr "�ลิ���ื�อ�ส��/��อ��ี�อยู���า��"
+
+#: ../widgets/misc/e-web-view.c:760
+#, c-format
+msgid "Click to open %s"
+msgstr "�ลิ���ื�อ��ิ� %s"
+
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%d %B %Ey"
+
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "��ิ�ิ�: �า� %s �ึ� %s"
+
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "ราย�าร��ิ�ิ� evolution"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "ราย�ื�อ�ุ��ึ��"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#: ../widgets/table/e-cell-date-edit.c:303
+msgid "Now"
+msgstr "��ะ�ี�"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:320
+msgctxt "table-date"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../widgets/table/e-cell-date-edit.c:328
+msgid "OK"
+msgstr "OK"
+
+#: ../widgets/table/e-cell-date-edit.c:878
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "�วลา��อ�อยู���รู����: %s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "��าร�อยละ�ะ��อ�อยู�����ว��ั����� 0 �ึ� 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-pixbuf.c:357
 msgid "Selected Column"
 msgstr "�อลัม���ี��ลือ�"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "�อลัม���ี����ัส"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "�อลัม���ี��ม�����ลือ�"
 
-#: ../widgets/table/e-cell-text.c:1799
+#: ../widgets/table/e-cell-text.c:1631
 msgid "Strikeout Column"
 msgstr "�อลัม���ี���า"
 
-#: ../widgets/table/e-cell-text.c:1806
+#: ../widgets/table/e-cell-text.c:1638
 msgid "Underline Column"
 msgstr "�อลัม���ี��ส�����"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1645
 msgid "Bold Column"
 msgstr "�อลัม���ัวห�า"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1652
 msgid "Color Column"
 msgstr "�อลัม��สี"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1666
 msgid "BG Color Column"
 msgstr "�อลัม��สี�ื��"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "�ลิ���ื�อ��ิ�ม"
+
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "ส�า�ะ"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ห��า��หลั�)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(หลั�มาห��า)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "�ม��รีย�"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "�ม��ั��ลุ�ม"
 
-#: ../widgets/table/e-table-config.c:643
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "�ส�������อมูล"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "�����อมูล�ี�มี"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "�����อมูล�ี�_มี:"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Ascending"
 msgstr "ห��า��หลั�"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "ล�า��ั��หม�"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "ล�า��ั��ห_ม�"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Descending"
 msgstr "หลั�มาห��า"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "�ั��ลุ�มราย�าร�าม"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "ย�าย_ล�"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "ย�าย_�ึ��"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "�ส���_����อมูล��ราย�าร"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "�ส�������อมูล�_�ราย�าร"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "�ส�������อมูล��_ราย�าร"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "�รีย�ลำ�ั�"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "�รีย�ราย�าร�าม"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "�า��ั���าม"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "�_����อมูล�ี��ส��..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "�ั�_�ลุ�ม�าม..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "�_ส�������อมูล��ราย�าร"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "�_ส�������อมูล��อ���ี��ามลำ�ั�:"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "�_รีย�..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "รหัส DnD"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "��อมูลส�ว�หัว���ม"
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
+msgid "Add a Column"
+msgstr "��ิ�ม�อลัม��"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
-msgid "Add a column..."
-msgstr "��ิ�ม�อลัม��..."
-
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "��รื�อ�มือ�ลือ���อ���อมูล"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -23437,308 +21929,3580 @@ msgstr ""
 "�าร��ิ�ม�อลัม�����ารา� �ำ�����ยลา���วา�\n"
 "�ี��ำ�ห����ี��ุ���อ��าร�ห��ส��"
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../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:350
+#: ../widgets/table/e-table-group-container.c:348
 #, 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:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../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:3028 ../widgets/table/e-table-item.c:3029
+#: ../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:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../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:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../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:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../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:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../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:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../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:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../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:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../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:3056 ../widgets/table/e-table-item.c:3057
+#: ../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:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../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:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../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:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../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:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../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:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../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:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../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:1452
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Customize Current View"
 msgstr "�รั�����มุมมอ��ั��ุ�ั�"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "Sort _Ascending"
 msgstr "�รีย��า�ห_��า��หลั�"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Sort _Descending"
 msgstr "�รีย��า�ห_ลั�มาห��า"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "_Unsort"
 msgstr "�_ม��รีย�"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1517
 msgid "Group By This _Field"
 msgstr "�ั��ลุ�ม�าม�_����อมูล�ี�"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1520
 msgid "Group By _Box"
 msgstr "�ั��ลุ�ม�าม_�ล�อ�"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1524
 msgid "Remove This _Column"
 msgstr "ล�_�อลัม���ี�"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1527
 msgid "Add a C_olumn..."
 msgstr "��ิ�ม�_อลัม��..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "A_lignment"
 msgstr "�าร_�ั��ิ��อ�"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "B_est Fit"
 msgstr "�รั��วาม�ว�า�_�อ�ี"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Format Column_s..."
 msgstr "�ั�รู�����อ_ลัม��..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Custo_mize Current View..."
 msgstr "�รั��_���มุมมอ��ั��ุ�ั�..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "_Sort By"
 msgstr "�_รีย��าม"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1618
 msgid "_Custom"
 msgstr "_�ำห���อ�"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "�ำ�รรยาย���อั�ษร"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "��อมูล�อ��าร�รีย�ลำ�ั�"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "����ม�"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
 msgid "Table header"
 msgstr "หัว�ารา�"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
 msgid "Table model"
 msgstr "����ำลอ���อมูล�ารา�"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
 msgid "Cursor row"
 msgstr "��ว�อ���อร���อร�"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../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:3345
+#: ../widgets/table/e-table.c:3360
 msgid "Use click to add"
 msgstr "�ลิ���ื�อ��ิ�ม"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../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:3383
+#: ../widgets/table/e-tree.c:3413
 msgid "Retro Look"
 msgstr "ห��า�า������า"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3414
 msgid "Draw lines and +/- expanders."
 msgstr "วา��ส���ละ��รื�อ�หมาย +/- สำหรั�ยุ�-�ยาย"
 
-#: ../widgets/text/e-text.c:2737
+#: ../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
+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
+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
+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
+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
+msgid "collapses the row in the ETree containing this cell"
+msgstr "ยุ������ ETree �ี���อ��ี�อยู�"
+
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr "��อ��ารา�"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "�ลิ�"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+msgid "sort"
+msgstr "�รีย�ลำ�ั�"
+
+#: ../widgets/text/e-text.c:2486
+msgid "Select All"
+msgstr "�ลือ��ั��หม�"
+
+#: ../widgets/text/e-text.c:2498
 msgid "Input Methods"
 msgstr "วิ�ี��อ���อ�วาม"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
 msgid "Event Processor"
 msgstr "�ัว�ั��าร�ห�ุ�าร��"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
+msgid "Text"
+msgstr "��อ�วาม"
+
+#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
 msgid "Bold"
 msgstr "ห�า"
 
-#: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582
+#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
 msgid "Strikeout"
 msgstr "�ี���า"
 
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
+#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
 msgid "Anchor"
 msgstr "สมอยึ�"
 
-#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
 msgid "Justification"
 msgstr "�าร�ั��ิ��อ�"
 
-#: ../widgets/text/e-text.c:3603 ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
 msgid "Clip Width"
 msgstr "�วาม�ว�า��อ��ลิ�"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
 msgid "Clip Height"
 msgstr "�วามสู��อ��ลิ�"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
 msgid "Clip"
 msgstr "�ลิ�"
 
-#: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
 msgid "Fill clip rectangle"
 msgstr "ระ�ายสี�ื���ลิ�"
 
-#: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
 msgid "X Offset"
 msgstr "ออ����� X"
 
-#: ../widgets/text/e-text.c:3638 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
 msgid "Y Offset"
 msgstr "ออ����� Y"
 
-#: ../widgets/text/e-text.c:3674 ../widgets/text/e-text.c:3675
+#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
 msgid "Text width"
 msgstr "�วาม�ว�า���อ�วาม"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
 msgid "Text height"
 msgstr "�วามสู���อ�วาม"
 
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
 msgid "Use ellipsis"
 msgstr "����ุ�����ลา"
 
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
 msgid "Ellipsis"
 msgstr "�ุ�����ลา"
 
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
 msgid "Line wrap"
 msgstr "�ั��รร�ั�"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
 msgid "Break characters"
 msgstr "�ั��ี�อั��ระ"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Max lines"
 msgstr "�ำ�ว��รร�ั�สู�สุ�"
 
-#: ../widgets/text/e-text.c:3746 ../widgets/text/e-text.c:3747
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
 msgid "Draw borders"
 msgstr "วา��อ�"
 
-#: ../widgets/text/e-text.c:3753 ../widgets/text/e-text.c:3754
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
 msgid "Allow newlines"
 msgstr "��ร�อั��ระ�ึ���รร�ั��หม����"
 
-#: ../widgets/text/e-text.c:3760 ../widgets/text/e-text.c:3761
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Draw background"
 msgstr "วา��ื��หลั�"
 
-#: ../widgets/text/e-text.c:3767 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
 msgid "Draw button"
 msgstr "วา��ุ�ม"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
 msgid "Cursor position"
 msgstr "�ำ�ห�����อร���อร�"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3782 ../widgets/text/e-text.c:3784
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
 msgid "IM Context"
 msgstr "IM Context"
 
-#: ../widgets/text/e-text.c:3790 ../widgets/text/e-text.c:3791
+#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
 msgid "Handle Popup"
 msgstr "�ั��ารห��า��า��ุ��ึ��"
 
+#~ msgid "search bar"
+#~ msgstr "������หา"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "������หา��ิ�ิ� evolution"
+
+#~ msgid "Combo Button"
+#~ msgstr "�ุ�ม�อม��"
+
+#~ msgid "Activate Default"
+#~ msgstr "�����า�ริยาย"
+
+#~ msgid "Popup Menu"
+#~ msgstr "�ม�ู����ุ��ึ��"
+
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "��อ�/�ส��������ม���"
+
+#~ msgid "activate"
+#~ msgstr "��ิ����"
+
+#~ msgid "Error loading address book."
+#~ msgstr "��ิ���อ�ิ��ลา���ะ�หล�สมุ��ี�อยู�"
+
+#~ msgid "Server Version"
+#~ msgstr "รุ����ิร���วอร�"
+
+#~ msgid "C_ontacts"
+#~ msgstr "�ู�_�ิ���อ"
+
+#~ msgid "Configure autocomplete here"
+#~ msgstr "�ำห����า��ิม���ม�ำอั���มั�ิ�ี��ี�"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "สมุ��ี�อยู� Evolution"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "�ี�อยู��ุ��ึ���า�สมุ��ี�อยู� Evolution"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "อ����ระ�อ��ส���ี�อยู���สมุ��ี�อยู��อ� Evolution"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "อ����ระ�อ��ส���าม�ั�ร��สมุ��ี�อยู��อ� Evolution"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "อ����ระ�อ�สมุ��ี�อยู��อ� Evolution"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "�าร�ว��ุม�าร�ั��าร��รั�รอ� S/MIME �อ� Evolution"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "�าร�ว��ุม�าร�ำห���าร�ั����า��ล��อร� Evolution"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "�ั��าร�าร�รว�สอ� S/MIME �อ��ุ��ี��ี� "
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "�าร�รั�รุ����า�ั��หรือ��ล��อร�สมุ��ี�อยู�ล�ม�หลว"
+
+#~ msgid "Base"
+#~ msgstr "�ุ��ริ�ม���"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "��ลี�ย��ื�อ��ล��อร� \"%s\" ����:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "��ลี�ย��ื�อ��ล��อร�"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "�ั��ึ����� vCard..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "�ล�อ��ลือ��หล���ู��ิ���อ"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "�ำ�ห����อ��ส���ั����อ���ว�ั�� ระหว�า���อ��ส���าม�ั�ร�ละราย�าร �ั���อ��ส���ัวอย�า� "
+#~ "��ห��วย�ิ���ล"
+
+#~ msgid "Look up in address books"
+#~ msgstr "��ิ�หา�า�สมุ��ี�อยู�"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>�ารยื�ยั��ัว�ุ��ล</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>�าร�าว���หล�</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>�าร���หา</b>"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>��ิ�:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "��ิ�มสมุ��ี�อยู�"
+
+#~ msgid "Basic"
+#~ msgstr "�ื���า�"
+
+#~ msgid "Distinguished name"
+#~ msgstr "Distinguished name"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr "Evolution �ะ����ี�อยู�อี�มล�ี���ื�อ�รว�สอ��ุ��ั���ิร���วอร�"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "หา�ุ��ั��������หา�ี����������"
+
+#~ msgid ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
+#~ msgstr ""
+#~ "�ุ��ั��������หา�ะ���� distinguished name (DN) "
+#~ "�อ�ราย�าร�ี��ุ���อ��าร�ห���������ุ��ริ�ม����าร���หา ��า�ุ��ล�อย��อ��ี�ว�า� "
+#~ "�าร���หา�อ��ุ��ะ�ริ�ม�ั�����รา��อ�สาร��"
+
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr "�ี��ือ�ื�อ���ม�อ���ิร���วอร� LDAP �อ��ุ� �ัวอย�า����� \"ldap.mycompany.com\""
+
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+#~ msgstr ""
+#~ "�ี��ือ�ำ�ว�สู�สุ��อ�ราย�าร�ี��ะ�าว���หล� "
+#~ "�าร�ั����า�ำ�ว��ี�สู���ิ����ะ�ำ�ห�สมุ��ี�อยู��อ��ุ��ำ�า���าล�"
+
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr ""
+#~ "�ี��ือ�ื�อสำหรั���ิร���วอร��ี� �ึ���ะ�รา������ล��อร� Evolution �อ��ุ� "
+#~ "�ะ�����ื�อวั��ุ�ระส����าร�ส�����า�ั��"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "�มื�อ���������"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "�_�ิ�มสมุ��ี�อยู�"
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>อี�มล</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>��า�</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>�า�</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>������ล��</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>อื���</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>��รศั���</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>�ี��ำ�า�</b>"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "_Notes:"
+#~ msgstr "_หมาย�ห�ุ:"
+
+#~ msgid "United States"
+#~ msgstr "สหรั�อ�มริ�า"
+
+#~ msgid "Afghanistan"
+#~ msgstr "อั��า�ิส�า�"
+
+#~ msgid "Albania"
+#~ msgstr "�อล����ีย"
+
+#~ msgid "Algeria"
+#~ msgstr "�อล�ี�รีย"
+
+#~ msgid "American Samoa"
+#~ msgstr "อ�มริ�ั��ามัว"
+
+#~ msgid "Andorra"
+#~ msgstr "อั��อร�รา"
+
+#~ msgid "Angola"
+#~ msgstr "�อ���ลา"
+
+#~ msgid "Anguilla"
+#~ msgstr "�อ��วิลลา"
+
+#~ msgid "Antarctica"
+#~ msgstr "�อ��าร���ิ�า"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "�อ��ิ�า�ละ�าร��ู�า"
+
+#~ msgid "Argentina"
+#~ msgstr "อาร�����ิ�า"
+
+#~ msgid "Armenia"
+#~ msgstr "อาร��ม��ีย"
+
+#~ msgid "Aruba"
+#~ msgstr "อารู�า"
+
+#~ msgid "Australia"
+#~ msgstr "ออส��ร�ลีย"
+
+#~ msgid "Austria"
+#~ msgstr "ออส��รีย"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "อาร���อร����า�"
+
+#~ msgid "Bahamas"
+#~ msgstr "�าฮามาส"
+
+#~ msgid "Bahrain"
+#~ msgstr "�าห��ร�"
+
+#~ msgid "Bangladesh"
+#~ msgstr "�ั��ลา��ศ"
+
+#~ msgid "Barbados"
+#~ msgstr "�าร�����ส"
+
+#~ msgid "Belarus"
+#~ msgstr "��ลารุส"
+
+#~ msgid "Belgium"
+#~ msgstr "��ล�ยียม"
+
+#~ msgid "Belize"
+#~ msgstr "��ลี�"
+
+#~ msgid "Benin"
+#~ msgstr "���ิ�"
+
+#~ msgid "Bermuda"
+#~ msgstr "��อร�มิว�า"
+
+#~ msgid "Bhutan"
+#~ msgstr "ภู�า�"
+
+#~ msgid "Bolivia"
+#~ msgstr "��ลิ�วีย"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "�อส��ีย�ละ�ฮอร�����วี�า"
+
+#~ msgid "Botswana"
+#~ msgstr "�อ�สวา�า"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "��าะ�ู�ว��"
+
+#~ msgid "Brazil"
+#~ msgstr "�รา�ิล"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "�ริ�ิ�อิ���ีย��อ��ีย���ร�ริ�อรี"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "�รู���ารุส�าลาม"
+
+#~ msgid "Bulgaria"
+#~ msgstr "�ัล���รีย"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "��อร��ิ�า�า��"
+
+#~ msgid "Burundi"
+#~ msgstr "�ุรุ��ี"
+
+#~ msgid "Cambodia"
+#~ msgstr "�ัม�ู�า"
+
+#~ msgid "Cameroon"
+#~ msgstr "���มอรู�"
+
+#~ msgid "Canada"
+#~ msgstr "���า�า"
+
+#~ msgid "Cape Verde"
+#~ msgstr "����วิร��"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "หมู���าะ��ย��ม�"
+
+#~ msgid "Central African Republic"
+#~ msgstr "สา�าร�รั��อ�ริ�า�ลา�"
+
+#~ msgid "Chad"
+#~ msgstr "�า�"
+
+#~ msgid "Chile"
+#~ msgstr "�ิลี"
+
+#~ msgid "China"
+#~ msgstr "�ี�"
+
+#~ msgid "Christmas Island"
+#~ msgstr "��าะ�ริสมาส��"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "หมู���าะ (�ีลิ�) ����ส"
+
+#~ msgid "Colombia"
+#~ msgstr "��ลัม��ีย"
+
+#~ msgid "Comoros"
+#~ msgstr "�อ�ม�รส"
+
+#~ msgid "Congo"
+#~ msgstr "�อ���"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "สา�าร�รั��อ���"
+
+#~ msgid "Cook Islands"
+#~ msgstr "หมู���าะ�ุ�"
+
+#~ msgid "Costa Rica"
+#~ msgstr "�อส�าริ�า"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "����ิวัวร�"
+
+#~ msgid "Croatia"
+#~ msgstr "��ร�อ��ีย"
+
+#~ msgid "Cuba"
+#~ msgstr "�ิว�า"
+
+#~ msgid "Cyprus"
+#~ msgstr "���รัส"
+
+#~ msgid "Czech Republic"
+#~ msgstr "สา�าร�รั�����"
+
+#~ msgid "Denmark"
+#~ msgstr "���มาร��"
+
+#~ msgid "Djibouti"
+#~ msgstr "�ิ�ู�ี"
+
+#~ msgid "Dominica"
+#~ msgstr "��มิ�ิ�า"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "สา�าร�รั���มิ�ิ�ั�"
+
+#~ msgid "Ecuador"
+#~ msgstr "�อ�วา�อร�"
+
+#~ msgid "Egypt"
+#~ msgstr "อียิ���"
+
+#~ msgid "El Salvador"
+#~ msgstr "�อล�ัลวา�อร�"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "อิ��ว�อ�รียล�ิ�ี"
+
+#~ msgid "Eritrea"
+#~ msgstr "�อริ��รีย"
+
+#~ msgid "Estonia"
+#~ msgstr "�อส����ีย"
+
+#~ msgid "Ethiopia"
+#~ msgstr "�อ�ิ�อ��ีย"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "หมู���าะ�อล���ล���"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "หมู���าะ���ร"
+
+#~ msgid "Finland"
+#~ msgstr "�ิ��ล���"
+
+#~ msgid "France"
+#~ msgstr "�รั���ศส"
+
+#~ msgid "French Guiana"
+#~ msgstr "��ร�����ีย�า"
+
+#~ msgid "French Polynesia"
+#~ msgstr "��ร�����ลิ�ี��ีย"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "��ร�����า��ิร����ร�ริ�อรีส�"
+
+#~ msgid "Gabon"
+#~ msgstr "�า�อ�"
+
+#~ msgid "Gambia"
+#~ msgstr "��ม��ีย"
+
+#~ msgid "Georgia"
+#~ msgstr "�อร���ีย"
+
+#~ msgid "Germany"
+#~ msgstr "�ยอรม�ี"
+
+#~ msgid "Ghana"
+#~ msgstr "�า�า"
+
+#~ msgid "Gibraltar"
+#~ msgstr "ยิ�รอล�าร�"
+
+#~ msgid "Greece"
+#~ msgstr "�รี�"
+
+#~ msgid "Greenland"
+#~ msgstr "�รี��ล���"
+
+#~ msgid "Grenada"
+#~ msgstr "��ร���า"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "�วา��อลู�"
+
+#~ msgid "Guam"
+#~ msgstr "�วม"
+
+#~ msgid "Guatemala"
+#~ msgstr "�ัว��มาลา"
+
+#~ msgid "Guernsey"
+#~ msgstr "��ิร���ีย�"
+
+#~ msgid "Guinea"
+#~ msgstr "�ิ�ี"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "�ิ�ี�ิส��า"
+
+#~ msgid "Guyana"
+#~ msgstr "�ายอา�า"
+
+#~ msgid "Haiti"
+#~ msgstr "�ฮ�ิ"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "��าะ�ฮิร���ละหมู���าะ�ม��อ�ัล��"
+
+#~ msgid "Holy See"
+#~ msgstr "��รรั�วา�ิ�ั�"
+
+#~ msgid "Honduras"
+#~ msgstr "ฮอ��ูรัส"
+
+#~ msgid "Hong Kong"
+#~ msgstr "ฮ�อ���"
+
+#~ msgid "Hungary"
+#~ msgstr "ฮั��ารี"
+
+#~ msgid "Iceland"
+#~ msgstr "�อ���ล���"
+
+#~ msgid "India"
+#~ msgstr "อิ���ีย"
+
+#~ msgid "Indonesia"
+#~ msgstr "อิ����ี��ีย"
+
+#~ msgid "Iran"
+#~ msgstr "อิหร�า�"
+
+#~ msgid "Iraq"
+#~ msgstr "อิรั�"
+
+#~ msgid "Ireland"
+#~ msgstr "�อร��ล���"
+
+#~ msgid "Isle of Man"
+#~ msgstr "��าะ�ม�"
+
+#~ msgid "Israel"
+#~ msgstr "อิสรา�อล"
+
+#~ msgid "Italy"
+#~ msgstr "อิ�าลี"
+
+#~ msgid "Jamaica"
+#~ msgstr "�า�ม�า"
+
+#~ msgid "Japan"
+#~ msgstr "�ี��ุ��"
+
+#~ msgid "Jersey"
+#~ msgstr "��อร��ีย�"
+
+#~ msgid "Jordan"
+#~ msgstr "�อร����"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "�า�ั�ส�า�"
+
+#~ msgid "Kenya"
+#~ msgstr "���ยา"
+
+#~ msgid "Kiribati"
+#~ msgstr "�ิริ�าส"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "��าหลี, สา�าร�รั��ระ�า��"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "��าหลี, สา�าร�รั�"
+
+#~ msgid "Kuwait"
+#~ msgstr "�ู�ว�"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "�ีร��ี�ส�า�"
+
+#~ msgid "Laos"
+#~ msgstr "ลาว"
+
+#~ msgid "Latvia"
+#~ msgstr "ลั��วีย"
+
+#~ msgid "Lebanon"
+#~ msgstr "�ล�า�อ�"
+
+#~ msgid "Lesotho"
+#~ msgstr "�ล����"
+
+#~ msgid "Liberia"
+#~ msgstr "�ล�ี�รีย"
+
+#~ msgid "Libya"
+#~ msgstr "ลิ��ีย"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "ลิ����ส����"
+
+#~ msgid "Lithuania"
+#~ msgstr "ลิ�ัว��ีย"
+
+#~ msgid "Luxembourg"
+#~ msgstr "ลั���ม��ิร��"
+
+#~ msgid "Macao"
+#~ msgstr "มา���า"
+
+#~ msgid "Macedonia"
+#~ msgstr "มา�ิ����ีย"
+
+#~ msgid "Madagascar"
+#~ msgstr "มา�า�ัส�าร�"
+
+#~ msgid "Malawi"
+#~ msgstr "มาลาวี"
+
+#~ msgid "Malaysia"
+#~ msgstr "มา�ล��ีย"
+
+#~ msgid "Maldives"
+#~ msgstr "มัล�ี�ส�"
+
+#~ msgid "Mali"
+#~ msgstr "มาลี"
+
+#~ msgid "Malta"
+#~ msgstr "มอล�า"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "หมู���าะมาร���ล"
+
+#~ msgid "Martinique"
+#~ msgstr "มาร��ิ�ี�"
+
+#~ msgid "Mauritania"
+#~ msgstr "มอริ����ีย"
+
+#~ msgid "Mauritius"
+#~ msgstr "มอริ��ียส"
+
+#~ msgid "Mexico"
+#~ msgstr "�ม���ิ��"
+
+#~ msgid "Micronesia"
+#~ msgstr "�ม��ร�ี��ีย"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "มอล��วา, สา�าร�รั�"
+
+#~ msgid "Monaco"
+#~ msgstr "�ม�า��"
+
+#~ msgid "Mongolia"
+#~ msgstr "มอ����ลีย"
+
+#~ msgid "Montserrat"
+#~ msgstr "มอ�����อร�รั�"
+
+#~ msgid "Morocco"
+#~ msgstr "�มร�อ���"
+
+#~ msgid "Mozambique"
+#~ msgstr "�ม�ัม�ิ�"
+
+#~ msgid "Myanmar"
+#~ msgstr "�ม�า"
+
+#~ msgid "Namibia"
+#~ msgstr "�ามิ��ีย"
+
+#~ msgid "Nauru"
+#~ msgstr "�าอูรู"
+
+#~ msgid "Nepal"
+#~ msgstr "���าล"
+
+#~ msgid "Netherlands"
+#~ msgstr "����อร��ล���"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "����อร��ล����อ��ิลลิส"
+
+#~ msgid "New Caledonia"
+#~ msgstr "หมู���าะ�ิว��ลิ����ีย"
+
+#~ msgid "New Zealand"
+#~ msgstr "�ิว�ี�ล���"
+
+#~ msgid "Nicaragua"
+#~ msgstr "�ิ�ารา�ัว"
+
+#~ msgid "Niger"
+#~ msgstr "����อร�"
+
+#~ msgid "Nigeria"
+#~ msgstr "���ี�รีย"
+
+#~ msgid "Niue"
+#~ msgstr "�ีอู�อ"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "��าะ�อร��อล��"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "หมู���าะ�อร���ิร��มา�รีย�า"
+
+#~ msgid "Norway"
+#~ msgstr "�อร��วย�"
+
+#~ msgid "Oman"
+#~ msgstr "�อมา�"
+
+#~ msgid "Pakistan"
+#~ msgstr "�า�ีส�า�"
+
+#~ msgid "Palau"
+#~ msgstr "�า�ลา"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "�ิ����ยึ��รอ��า�ลส����"
+
+#~ msgid "Panama"
+#~ msgstr "�า�ามา"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "�า�ัว�ิว�ิ�ี"
+
+#~ msgid "Paraguay"
+#~ msgstr "�ารา�วัย"
+
+#~ msgid "Peru"
+#~ msgstr "��รู"
+
+#~ msgid "Philippines"
+#~ msgstr "�ิลิ��ิ�ส�"
+
+#~ msgid "Pitcairn"
+#~ msgstr "��าะ�ิ���ร��"
+
+#~ msgid "Poland"
+#~ msgstr "���ล���"
+
+#~ msgid "Portugal"
+#~ msgstr "��ร�ุ��ส"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "��อร���ริ��"
+
+#~ msgid "Qatar"
+#~ msgstr "�า�าร�"
+
+#~ msgid "Reunion"
+#~ msgstr "�รอู�ีย�"
+
+#~ msgid "Romania"
+#~ msgstr "�รมา��ีย"
+
+#~ msgid "Russian Federation"
+#~ msgstr "สห�ั��รั�รัส��ีย"
+
+#~ msgid "Rwanda"
+#~ msgstr "รวั��า"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "������ิ�ส��ละ��วิส"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "�����ลู��ีย"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "�����วิ�������ละ��ร�า�ี�ส�"
+
+#~ msgid "Samoa"
+#~ msgstr "�ามัว"
+
+#~ msgid "San Marino"
+#~ msgstr "�า�มาริ��"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "��า���ม �ละ �ริ��ิ��"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "�าอุ�ีอาระ��ีย"
+
+#~ msgid "Senegal"
+#~ msgstr "�����ัล"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "��อร���ีย�ละมอ�������ร"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "��ียร�ราลี�อ�"
+
+#~ msgid "Singapore"
+#~ msgstr "สิ����ร�"
+
+#~ msgid "Slovakia"
+#~ msgstr "ส�ลวะ��ีย"
+
+#~ msgid "Slovenia"
+#~ msgstr "ส�ลวี��ีย"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "หมู���าะ���ลมอ�"
+
+#~ msgid "Somalia"
+#~ msgstr "��มา�ลีย"
+
+#~ msgid "South Africa"
+#~ msgstr "�อ�ริ�า���"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "��าะ��า���อร���ีย�ละหมู���าะ��า�������วิ�"
+
+#~ msgid "Spain"
+#~ msgstr "ส���"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "ศรีลั��า"
+
+#~ msgid "St. Helena"
+#~ msgstr "������ฮ�ล�า"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "����ี�ยร��ละมี��อล�"
+
+#~ msgid "Sudan"
+#~ msgstr "�ู�า�"
+
+#~ msgid "Suriname"
+#~ msgstr "�ูริ�า�ม"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "หมู���าะส�าล�าร��ละยา��ม�อ�"
+
+#~ msgid "Swaziland"
+#~ msgstr "สวา�ิ�ล���"
+
+#~ msgid "Sweden"
+#~ msgstr "สวี���"
+
+#~ msgid "Switzerland"
+#~ msgstr "สวิ���อร��ล���"
+
+#~ msgid "Syria"
+#~ msgstr "�ี�รีย"
+
+#~ msgid "Taiwan"
+#~ msgstr "���หวั�"
+
+#~ msgid "Tajikistan"
+#~ msgstr "�า�ิ�ิส�า�"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "����า��ีย, สหสา�าร�รั�"
+
+#~ msgid "Thailand"
+#~ msgstr "��ย"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "�ิมอร�-�ลส��"
+
+#~ msgid "Togo"
+#~ msgstr "����"
+
+#~ msgid "Tokelau"
+#~ msgstr "�����ลา"
+
+#~ msgid "Tonga"
+#~ msgstr "�อ��า"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "�ริ�ิ����ละ������"
+
+#~ msgid "Tunisia"
+#~ msgstr "�ู�ิ��ีย"
+
+#~ msgid "Turkey"
+#~ msgstr "�ุร�ี"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "��ิร���ม�ิส�า�"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "หมู���าะ��ิ�ส��ละหมู���าะ���อส"
+
+#~ msgid "Tuvalu"
+#~ msgstr "�ูวาลู"
+
+#~ msgid "Uganda"
+#~ msgstr "ยู�ั��า"
+
+#~ msgid "Ukraine"
+#~ msgstr "ยู��ร�"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "สหรั�อาหรั��อมิ�ร�ส�"
+
+#~ msgid "United Kingdom"
+#~ msgstr "สหรา�อา�า�ั�ร"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "��าะ�ล��รอ��อ��อ�สหรั�อ�มริ�า"
+
+#~ msgid "Uruguay"
+#~ msgstr "อุรุ�วัย"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "อุ����ิส�า�"
+
+#~ msgid "Vanuatu"
+#~ msgstr "วา�ูอา�ู"
+
+#~ msgid "Venezuela"
+#~ msgstr "�ว���ุ�อลา"
+
+#~ msgid "Viet Nam"
+#~ msgstr "�วีย��าม"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "หมู���าะ�ริ�ิ��วอร��ิ�"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "หมู���าะ�วอร��ิ��อ�สหรั�อ�มริ�า"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "หมู���าะวาลลิส�ละหมู���าะ�ุ�ู�า"
+
+#~ msgid "Western Sahara"
+#~ msgstr "�าฮารา�ะวั���"
+
+#~ msgid "Yemen"
+#~ msgstr "�ย�ม�"
+
+#~ msgid "Zambia"
+#~ msgstr "��ม��ีย"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "�ิม�ั��ว"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu Messenger"
+
+#~ msgid "Service"
+#~ msgstr "�ริ�าร"
+
+#~ msgid "Username"
+#~ msgstr "�ื�อ�ู����"
+
+#~ msgid "Address _2:"
+#~ msgstr "�ี�อยู� _2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "�_มือ�:"
+
+#~ msgid "Countr_y:"
+#~ msgstr "�ระ�_�ศ:"
+
+#~ msgid "Full Address"
+#~ msgstr "�ี�อยู�������ม"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "_รหัส��รษ�ีย�:"
+
+#~ msgid "_Account name:"
+#~ msgstr "_�ื�อ�ั��ี:"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_�ริ�าร IM:"
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>สมา�ิ�</b>"
+
+#~ msgid "Name begins with"
+#~ msgstr "�ื�อ�ึ�������วย"
+
+#~ msgid "_Open"
+#~ msgstr "�_�ิ�"
+
+#~ msgid "_Print"
+#~ msgstr "_�ิม��"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "_�ั�ลอ���ยั�สมุ��ี�อยู�..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "_ย�าย��ยั�สมุ��ี�อยู�..."
+
+#~ msgid "Cu_t"
+#~ msgstr "_�ั�"
+
+#~ msgid "_Copy"
+#~ msgstr "_�ั�ลอ�"
+
+#~ msgid "P_aste"
+#~ msgstr "_��ะ"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s มีอยู��ล�ว\n"
+#~ "�ุ���อ��าร��ีย��ั�หรือ�ม�?"
+
+#~ msgid "Overwrite"
+#~ msgstr "��ีย��ั�"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "�ู��ิ���อ"
+#~ msgstr[1] "�ู��ิ���อ"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "�ำลั����สมุ��ี�อยู�..."
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "����อร�ม��ล�า��อ��าย:"
+
+#~ msgid "Body"
+#~ msgstr "�ัว��ื�อหา"
+
+#~ msgid "Bottom:"
+#~ msgstr "ล�า�:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "��า�:"
+
+#~ msgid "F_ont..."
+#~ msgstr "���_อั�ษร..."
+
+#~ msgid "Fonts"
+#~ msgstr "���อั�ษร"
+
+#~ msgid "Footer:"
+#~ msgstr "��าย�ระ�าษ:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "หัว�ระ�าษ/��าย�ระ�าษ"
+
+#~ msgid "Headings"
+#~ msgstr "หัว�ระ�าษ"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "หัว�ระ�าษสำหรั���หมาย���ละ��ั�"
+
+#~ msgid "Height:"
+#~ msgstr "สู�:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "�รีย��ิ���อ�ั�"
+
+#~ msgid "Landscape"
+#~ msgstr "��ว�อ�"
+
+#~ msgid "Left:"
+#~ msgstr "��าย:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "����หมว�อั�ษร��า���า�"
+
+#~ msgid "Margins"
+#~ msgstr "�อ��ระ�าษ"
+
+#~ msgid "Number of columns:"
+#~ msgstr "�ำ�ว��อลัม��:"
+
+#~ msgid "Orientation"
+#~ msgstr "��ววา�"
+
+#~ msgid "Page"
+#~ msgstr "ห��า"
+
+#~ msgid "Page Setup:"
+#~ msgstr "�ั����าห��า�ระ�าษ:"
+
+#~ msgid "Paper"
+#~ msgstr "�ระ�าษ"
+
+#~ msgid "Paper source:"
+#~ msgstr "�หล���ระ�าษ"
+
+#~ msgid "Portrait"
+#~ msgstr "��ว�ั��"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "�ิม����วย���สี��า"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "�ลิ��ลั�ห��า�ู�"
+
+#~ msgid "Right:"
+#~ msgstr "�วา:"
+
+#~ msgid "Sections:"
+#~ msgstr "ส�ว���า��:"
+
+#~ msgid "Size:"
+#~ msgstr "��า�:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "�ริ�ม�ี�ห��า�หม�"
+
+#~ msgid "Style name:"
+#~ msgstr "�ื�อส��ล�"
+
+#~ msgid "Top:"
+#~ msgstr "��:"
+
+#~ msgid "Width:"
+#~ msgstr "�ว�า�:"
+
+#~ msgid "_Font..."
+#~ msgstr "�_��อั�ษร..."
+
+#~ msgid "Save Appointment"
+#~ msgstr "�ั��ึ��ั�หมาย"
+
+#~ msgid "Save Memo"
+#~ msgstr "�ั��ึ��ั��ึ���วย�ำ"
+
+#~ msgid "Save Task"
+#~ msgstr "�ั��ึ�ภาร�ิ�"
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "�ำห����า�วลา���ระ��ศ ��ิ�ิ� �ละราย�ารภาร�ิ��อ��ุ��ี��ี�"
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "��ิ�ิ��ละภาร�ิ� Evolution"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "�าร�ว��ุม�าร�ำห����า��ิ�ิ� Evolution"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "��รื�อ�มือ�ส����อ�วาม�าร�ั��วลา��ิ�ิ��อ� Evolution"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "��รื�อ�มือ����� ��ิ�ิ�/ภาร�ิ� Evolution"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "อ����ระ�อ���ิ�ิ��อ� Evolution"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "อ����ระ�อ��ั��ึ���วย�ำ�อ� Evolution"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "อ����ระ�อ�ภาร�ิ��อ� Evolution"
+
+#~ msgid "Memo_s"
+#~ msgstr "�ั��ึ�_��วย�ำ"
+
+#~ msgid "_Calendars"
+#~ msgstr "_��ิ�ิ�"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "�ริ�าร�าร�ระ�าศ������ือ���ิ�ิ� Evolution"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "�ม�สามาร��ริ�ม����า� Bonobo ���"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr "�ม�สามาร�สร�า��ร��า��ริ�าร������ือ���� �า��ี�ร��า�อา���ิ��ำ�า�อยู��ล�ว..."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr ""
+#~ "�ำ�ห����อ��ส���ั����อ���ว�ั�� ระหว�า���อ�ราย�ารภาร�ิ��ั���อ��ส���ัวอย�า� ��ห��วย�ิ���ล"
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "�ส����อ� \"�ส���ัวอย�า�\""
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "�ำห��ว�า�ะ����าร�รั��วลาห��าร�อ���ะ�ส���ห�ุ�าร����า�� หรือ�ม�"
+
+#~ msgid "daylight savings time"
+#~ msgstr "�รั��วลาห��าร�อ�"
+
+#~ msgid "Category is"
+#~ msgstr "อยู���หมว�"
+
+#~ msgid "Comment contains"
+#~ msgstr "มี�วาม�ิ��ห��"
+
+#~ msgid "Location contains"
+#~ msgstr "ส�า��ี�มี�ำว�า"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "�_�รียม��ื�อ����า�ออ��ล��"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "�_ม���อ������ว�����า�ออ��ล��"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "�าร�รั��รุ�รุ����ิ�ิ�ล�ม�หลว"
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "�ม�สามาร���ิ���ิ�ิ� '%s' ��ื�อ�ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "�ม�มี��ิ�ิ��ี��ะ������สำหรั��ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
+
+#~ msgid "New appointment"
+#~ msgstr "�ั�หมาย�หม�"
+
+#~ msgid "New meeting"
+#~ msgstr "�าร�ระ�ุม�หม�"
+
+#~ msgid "New all day appointment"
+#~ msgstr "�ั�หมาย�ลอ��ั��วั��หม�"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "��ิ���อ�ิ��ลา���ะ��ิ���ิ�ิ�"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "�รีย��ม�อ��ี��ม�รอ�รั���ะ��ิ���ิ�ิ�"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "�ม�อ�ุ�า��ห���ิ���ิ�ิ�"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>��ือ�</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>�ัว�ลือ�</b>"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "������ม"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 �า�ี\n"
+#~ "30 �า�ี\n"
+#~ "15 �า�ี\n"
+#~ "10 �า�ี\n"
+#~ "05 �า�ี"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">�าร�����ห�ุ</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">ราย�ารภาร�ิ�</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">�วลา</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">สั��าห��ำ�า�</span>"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "�รั��วลาห��า_ร�อ�"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "�า�ี\n"
+#~ "�ั�ว�ม�\n"
+#~ "วั�"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "วั��ั��ร�\n"
+#~ "วั�อั��าร\n"
+#~ "วั��ุ�\n"
+#~ "วั��ฤหัส��ี\n"
+#~ "วั�ศุ�ร�\n"
+#~ "วั��สาร�\n"
+#~ "วั�อา�ิ�ย�"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "��อ�วาม�ี����มา - %s"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "ย��ลิ��าร_ลา�"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "���ม��� <b>%d</b> ���ม"
+#~ msgstr[1] "���ม��� <b>%d</b> ���ม"
+
+#~ msgid "Show Attachments"
+#~ msgstr "�ส�����ม���"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "����ร��ว��วรร���ื�อ��อ�/�ส��������ม���"
+
+#~ msgid "_Add "
+#~ msgstr "�_�ิ�ม"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>�ู��_��า�ระ�ุม</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "�_�ลี�ย��ู��ระสา��า�"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "�ี�อยู�_�ิ���อ..."
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>�ส���ัวอย�า�</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>�าร�วีย���ำ</b>"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">������ล��</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">ส�า�ภา�</span>"
+
+#~ msgid "Save As..."
+#~ msgstr "�ั��ึ�����..."
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "untitled_image.%s"
+
+#~ msgid "_Save As..."
+#~ msgstr "_�ั��ึ�����..."
+
+#~ msgid "_Save Selected"
+#~ msgstr "_�ั��ึ�สิ���ี��ลือ�"
+
+#~ msgid "P_rint..."
+#~ msgstr "_�ิม��..."
+
+#~ msgid "C_ut"
+#~ msgstr "_�ั�"
+
+#~ msgid "_Paste"
+#~ msgstr "�_�ะ"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "_�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�า�สร���ล�ว"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "_�ำ��รื�อ�หมายภาร�ิ��ี��ลือ�ว�ายั��ม��สร��"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "ล�_ภาร�ิ��ี��ลือ�"
+
+#~ msgid "Select T_oday"
+#~ msgstr "�ลือ�_วั��ี�"
+
+#~ msgid "_Select Date..."
+#~ msgstr "�_ลือ�วั�..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "�ิ_ม��..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "ล��ั��ึ�_��วย�ำ�ี��ลือ�"
+
+#~ msgid "Deleting selected objects..."
+#~ msgstr "�ำลั�ล�สิ���ี��ลือ�..."
+
+#~ msgid "Completing tasks..."
+#~ msgstr "�ำลั���ภาร�ิ�..."
+
+#~ msgid "_Custom View"
+#~ msgstr "มุมมอ�_�ำห���อ�"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "_�ั��ึ�มุมมอ��ี��ำห���อ�"
+
+#~ msgid "_Define Views..."
+#~ msgstr "_�ำห��มุมมอ�..."
+
+#~ msgid "Loading appointments at %s"
+#~ msgstr "�ำลั��หล��ั�หมาย�า� %s"
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "�ำลั��หล�ภาร�ิ��า� %s"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "�ำลั��หล��ั��ึ���วย�ำ�ี� %s"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "�าร�รั��รุ�รุ���ั��ึ���วย�ำล�ม�หลว"
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr "�ม�สามาร���ิ�ราย�าร�ั��ึ���วย�ำ '%s' สำหรั��ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "�ม�มี��ิ�ิ��ี�������สำหรั��ารสร�า��ั��ึ���วย�ำ"
+
+#~ msgid "New shared memo"
+#~ msgstr "�ั��ึ���วย�ำ���ร�วม�ิ���หม�"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "_ราย�าร�ั��ึ���วย�ำ"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "�รั�รุ����อมูลภาร�ิ��ม�สำ�ร��"
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr "�ม�สามาร���ิ�ราย�ารภาร�ิ� '%s' สำหรั��ารสร�า��ห�ุ�าร���ละ�าร�ระ�ุม"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "�ม�มี��ิ�ิ��ี�������สำหรั��ารสร�า�ภาร�ิ�"
+
+#~ msgid "New task"
+#~ msgstr "ภาร�ิ��หม�"
+
+#~ msgid "New assigned task"
+#~ msgstr "ภาร�ิ��ี����รั�มอ�หมาย�หม�"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "_ราย�ารภาร�ิ�"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "�ม�สามาร���ิ����ม�ั��ึ�อั���มั�ิ"
+
+#~ msgid "_Security"
+#~ msgstr "_ระ��รั�ษา�วาม�ลอ�ภัย"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "��อ�_�ระ�าศ�ี�"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "��อ�/�ส����อ� �ระ�าศ�ี� (Post-To)"
+
+#~ msgid "_Subject Field"
+#~ msgstr "��อ��ื�อ�_รื�อ�"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "��อ�/�ส����อ���อมูล�ื�อ�รื�อ�"
+
+#~ msgid "_To Field"
+#~ msgstr "��อ�_�ึ�"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "��อ�/�ส����อ� �ึ� (To)"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "��อ��_�����ม���"
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "�ม�สามาร�������ร��อรี���ั���หมาย"
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr ""
+#~ "มี�ัว�ลือ��อ��ารส�����าะสำหรั��ั��ี Novell GroupWise �ละ Microsoft Exchange ���า�ั��"
+
+#~ msgid "Send options not available."
+#~ msgstr "�ม�มี�ัว�ลือ��อ��ารส��"
+
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+#~ msgstr ""
+#~ "หา���อ��าร�����ื�อหา�อ����ร��อรี�ี� �ุ�อา�������ม��า�� �����ร��อรี�ี��ีละ���ม "
+#~ "หรือ�ม���สร�า����ม�ั������อ����ร��อรี�ล�ว������ม�ั������ั��ล�าว��"
+
+#~ msgid "Unfinished messages found"
+#~ msgstr "�รว�����อ�วาม�ี���ีย���า��ว�"
+
+#~ msgid "Warning: Modified Message"
+#~ msgstr "�ำ��ือ�: ��อ�วามมี�าร��ลี�ย���ล�"
+
+#~ msgid "Evolution Information"
+#~ msgstr "��อมูล Evolution"
+
+#~ msgid "Evolution Query"
+#~ msgstr "�ำ�าม�า� Evolution"
+
+#~ msgid "Component"
+#~ msgstr "อ����ระ�อ�"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "��ีย��ั����มหรือ�ม�?"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "��ายว�า���ล�า�ม����"
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr "มี��าย�ื�อ�ี�����ื�อ��ียว�ั�อยู���อ��ล�ว����ิร���วอร� �รุ�า�ั���ื�อ�หม�"
+
+#~ msgid "Test"
+#~ msgstr "��สอ�"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>_���าร�รอ�</b>"
+
+#~ msgid "Rule name"
+#~ msgstr "�ื�อ��"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr "�ั����า�มล รวม�ึ�ระ��รั�ษา�วาม�ลอ�ภัย�ละ�าร�ส���ล �ี��ี�"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "�ั����า�าร�รว��ัวสะ�� ลาย���� �ละ��รื�อ�มือ��ีย���อ�วาม �ี��ี�"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "�ั����า�าร��ื�อม��อ��รือ��าย�อ��ุ��ี��ี�"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "�มล Evolution"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "��รื�อ�มือ�ว��ุม�าร�ั����า�ั��ี�มล�อ� Evolution"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "อ����ระ�อ��มล�อ� Evolution"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "��รื�อ�มือ��ีย��มล�อ� Evolution"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "��รื�อ�มือ�ว��ุม��า�ั����รื�อ�มือ��ีย��มล�อ� Evolution"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "��รื�อ�มือ�ว��ุม�าร�รั������มล�อ� Evolution"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "��รื�อ�มือ�ว��ุม��า�ั���าร��ื�อม��อ��รือ��าย Evolution"
+
+#~ msgid "[Default]"
+#~ msgstr "[�ั��ีหลั�]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "ลาย����"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "_�ั�ลอ���ยั���ล��อร�"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "_ย�าย��ยั���ล��อร�"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "�_�ิ���ห��า��า��หม�"
+
+#~ msgid "_Move..."
+#~ msgstr "_ย�าย..."
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "��ล��อร����หา�ี�ยั��_ม�อ�า�"
+
+#~ msgid "U_ndelete"
+#~ msgstr "�_ม�ล�"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "�ั��_�ว�า�สร���ล�ว"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "ล�_า���"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "สร�า�_���า���อ�วาม"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "สร�า���ล��อร����หา�า��ื�อ�_รื�อ�..."
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_ส��"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "สร�า���ล��อร����หา�า��ื�อ�ู�_รั�"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "�รอ��ี��ื�อ�_รื�อ�"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "�รอ��ี��ื�อ�ู�_ส��"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "�รอ��ี��ื�อ�ู�_รั�"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "�รอ��ี��_มลลิ�ลิส��"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "�ำลั��ึ���อ�วาม..."
+
+#~ msgid "C_all To..."
+#~ msgstr "�_รีย���..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "�สร���มื�อ %d %B %Ey %H:%M"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "ภาย�� %d %B %Ey %H:%M"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "_�อ�ี�วาม�ว�า�"
+
+#~ msgid "Save attachment as"
+#~ msgstr "�ั��ึ����ม�������"
+
+#~ msgid "Select folder to save all attachments"
+#~ msgstr "�ลือ���ล��อร��ี��ะ�ั��ึ����ม����ั��หม�"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "_�ั��ึ�ราย�าร�ี��ลือ�..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "���ม�_�� %d ��ั�"
+#~ msgstr[1] "���ม�_�� %d ��ั�"
+
+#~ msgid "S_ave"
+#~ msgstr "_�ั��ึ�"
+
+#~ msgid "No Attachment"
+#~ msgstr "�ม�มี���ม���"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a, %R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid "Tag"
+#~ msgstr "��าย"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "_�อ���ยั��ู�ส��"
+
+#~ msgid "message"
+#~ msgstr "��อ�วาม"
+
+#~ msgid "Save Message..."
+#~ msgstr "�ั��ึ���อ�วาม..."
+
+#~ msgid "Add address"
+#~ msgstr "��ิ�ม�ี�อยู�"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "�วามสู��ริยาย�อ�ห��า��า���อ�วาม"
+
+#~ msgid "Default width of the message window."
+#~ msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���อ�วาม"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "��ิ�����วามสามาร����าร���หาภาย�������า� ��ื�อ�ห��ุ�สามาร��ริ�ม�าร���หา�������อ� "
+#~ "��วย�าร�ิม����อ�วาม �ระ�ย������ือ �ุ�สามาร�หา��ล��อร��������า������ย��ีย��ิม���ื�อ��ล��อร� "
+#~ "�ล�ว����ลือ����ะ�ระ�����ยั���ล��อร��ั����ยอั���มั�ิ��ะ�ิม��"
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "��า��อ� \"�ัวอย�า���อ�วาม\" ��ิ���� �ห��ส����อ��ั��ล�าว����า���า� ����ี��ะ�รีย�����ว�ั��"
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr "�ิ�หรือ��ิ��าร�าม��ำ� ว�า��อ��รั���อมูล���ออ��ล��หรือ�ม� ��อ��ี��ะ���าสู��หม�ออ��ล��"
+
+#~ msgid "Message Window default height"
+#~ msgstr "�วามสู��ริยาย�อ�ห��า��า���อ�วาม"
+
+#~ msgid "Message Window default width"
+#~ msgstr "�วาม�ว�า��ริยาย�อ�ห��า��า���อ�วาม"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "�าม��ื�อ�รว�สอ�ว�า�ู������อ��ารออ��ล���ั��ีหรือ�ม�"
+
+#~ msgid "Thread the message list."
+#~ msgstr "�รีย��ระ�ู���ราย�าร��อ�วาม"
+
+#~ msgid "Thread the message-list"
+#~ msgstr "�รีย��ระ�ู���ราย�าร��อ�วาม"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "�รีย���อ�ห��า��า����วา���า��ั�����ว�อ�"
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "�ม�ู มุมมอ�/สำ��าลั� �าอยู�"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "�ม�ู มุมมอ�/สำ��าลั� �าอยู�"
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "�ม�ู มุมมอ�/สำ��า�ึ� �าอยู�"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "�ม�ู มุมมอ�/สำ��า�ึ� �าอยู�"
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "�ม�ู มุมมอ�/�า� �าอยู�"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "�ม�ู มุมมอ�/�า� �าอยู�"
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "�ม�ู มุมมอ�/�ระ�าศ�ี� �าอยู�"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "�ม�ู มุมมอ�/�ระ�าศ�ี� �าอยู�"
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "�ม�ู มุมมอ�/�ี�อยู��อ��ลั� �าอยู�"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "�ม�ู มุมมอ�/�ี�อยู��อ��ลั� �าอยู�"
+
+#~ msgid "New Mail Message"
+#~ msgstr "��อ�วาม�มล�หม�"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "��ล��อร��มล�หม�"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "�รั�รุ����า�ั��หรือ��ล��อร��มล�ม�สำ�ร��"
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr "_�รว�สอ�หา��ิ��ี�รอ�รั�"
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>_ลาย����</b>"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>_ภาษา</b>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">�ารยื�ยั��ัว�ุ��ล</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">�ารร�า���อ�วาม</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">�าร�ำห����า</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">�ฤ�ิ�รรม���ิ</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">��อมูล_หัว��อ�วาม�ี��ส��</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">��าย</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">�าร�หล�รู�ภา�</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">�าร�ส����อ�วาม</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">�ัวอั�ษร��อ�วาม</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">�าร����รั���อ�วาม</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">��อมูล�สริม</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">�ัว�ลือ�</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">���อั�ษรสำหรั��ิม��</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">�าร�ั����า�ร�อ��ี</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">��อมูล�ำ����</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">MIME �ิรภัย (S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">ระ���ิรภัย</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">��หมายออ��ละ��หมายร�า�</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">�าร�ำห����า��ิร���วอร�</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">��ิ��อ��าร_ยื�ยั��ัว�ุ��ล</span>"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "�อล�ิ� (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "�อล�ิ� (ISO-8859-4)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "_�รว�สอ���ิ��ี�รอ�รั�"
+
+#~ msgid "Email Accounts"
+#~ msgstr "�ั��ีอี�มล"
+
+#~ msgid "Message Composer"
+#~ msgstr "�าร��ีย���อ�วาม"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "�ฮส�� S_OCKS:"
+
+#~ msgid "Signatures Table"
+#~ msgstr "�ารา�ลาย����"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "URL สำหรั��ั����า�ร�อ��ี_อั���มั�ิ:"
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>�หล��สำหรั���ล��อร����หา</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">ลาย�����ิ�ิ�ัล</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">�าร���ารหัส</span>"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "�ัว�ิม���ห��-�_ล���ร��ั�"
+
+#~ msgid "F_ind:"
+#~ msgstr "_หา:"
+
+#~ msgid "Find in Message"
+#~ msgstr "หา����อ�วาม"
+
+#~ msgid "None Selected"
+#~ msgstr "�ม�����ลือ�"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "ล� \"{0}\" หรือ�ม�?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "ล���อ�วาม����ล��อร����หาหรือ�ม�?"
+
+#~ msgid "Discard changes?"
+#~ msgstr "ละ�ลย�าร��ลี�ย���ล�หรือ�ม�?"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "�ำ��รื�อ�หมายว�า�ุ���อ�วามอ�า��ล�ว"
+
+#~ msgid "Querying server"
+#~ msgstr "�ำลั�สอ��าม��ิร���วอร�"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "�ื�อ�รื�อ�หรือ�ู�รั�มี�ำว�า"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "อ����ระ�อ��ื���า�สำหรั�สมุ��ี�อยู�����รื�อ�"
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr "�รว���าะ�ส����อ�วาม�ี��ล�าว�ึ����ม��� �ละ��ือ���า�า����ม�����"
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "�ลั��อิ�สำหรั��าร�ั��รีย���อ�วาม �ึ���ส�����ม����ี������สีย�ล����รร�ั� �ละ�ห��ุ��ล���สีย��า� "
+#~ "Evolution ��ย�ร����"
+
+#~ msgid "Audio inline plugin"
+#~ msgstr "�ลั��อิ��สีย����รร�ั�"
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr "�ลั��อิ�สำหรั�สำรอ��ละ�ื����อมูล�ละ��า�ั���อ� Evolution"
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "�หล����ิ�ิ� CalDAV"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ���อ��ิ��"
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "��ิ�ิ� HTTP"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ� webcal �ละ http"
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "อ����ระ�อ��ื���า��อ���ิ�ิ�สภา�อา�าศ"
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr "�ลั��อิ���สอ� �ึ��สา�ิ��ลั��อิ�����ุ��ม�ู �ห��ุ��ั�ลอ�สิ����า�� ล��ลิ��อร��"
+
+#~ msgid "Copy tool"
+#~ msgstr "��รื�อ�มือ�ั�ลอ�"
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr "อ����ระ�อ��ื���า�สำหรั��ลือ��ำห����ิ�ิ�หรือสมุ��ี�อยู�����ราย�าร�ริยาย"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "��ิ���ล��อร�อื���อ��ู����"
+
+#~ msgid "_Account:"
+#~ msgstr "_�ื�อ�ั��ี:"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "�ื�อ�_�ล��อร�:"
+
+#~ msgid "_User:"
+#~ msgstr "_�ื�อ�ู����:"
+
+#~ msgid "Secure Password"
+#~ msgstr "รหัส��า��ิรภัย"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr ""
+#~ "�ัว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร� Exchange ��ย����ารยื�ยั��ัว����วยรหัส��า��ิรภัย (NTLM)"
+
+#~ msgid "Plaintext Password"
+#~ msgstr "รหัส��า���อ�วาม��ล�า"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+#~ msgstr ""
+#~ "�ัว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร� Exchange ��ย����ารยื�ยั��ัว����วยรหัส��า���อ�วาม��ล�า"
+
+#~ msgid "Out Of Office"
+#~ msgstr "�ม�อยู��ี��ำ�า�"
+
+#~ msgid ""
+#~ "The message specified below will be automatically sent to \n"
+#~ "each person who sends mail to you while you are out of the office."
+#~ msgstr ""
+#~ "��อ�วาม�ี�ระ�ุ��า�ล�า��ี��ะ�ู�ส��อั���มั�ิ \n"
+#~ "��ยั����ละ���ี�ส���มล�ึ��ุ� ����ะ�ี��ุ��ม�อยู��ี�สำ�ั��า�"
+
+#~ msgid "I am out of the office"
+#~ msgstr "�ั��ม�อยู��ี�สำ�ั��า�"
+
+#~ msgid "I am in the office"
+#~ msgstr "�ั�อยู��ี�สำ�ั��า�"
+
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "��ลี�ย�รหัส��า�สำหรั��ั��ี Exchange"
+
+#~ msgid "Change Password"
+#~ msgstr "��ลี�ย�รหัส��า�"
+
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "�ั��าร��า�ั���อ��ารมอ��ั��ะสำหรั��ั��ี Exchange"
+
+#~ msgid "Delegation Assistant"
+#~ msgstr "��รื�อ�มือ��วยมอ��ั��ะ"
+
+#~ msgid "Miscelleneous"
+#~ msgstr "������ล��"
+
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "�ู��า��อ���ล��อร�"
+
+#~ msgid "Folders Size"
+#~ msgstr "��า��อ���ล��อร�"
+
+#~ msgid "Exchange Settings"
+#~ msgstr "��า�ั�� Exchange"
+
+#~ msgid "_OWA URL:"
+#~ msgstr "_OWA URL:"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "ยื_�ยั��ัว�ุ��ล"
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "_ระ�ุ�ื�อ�ล�อ��มล"
+
+#~ msgid "_Mailbox:"
+#~ msgstr "�ล�อ��_มล:"
+
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "0 KB"
+#~ msgstr "0 KB"
+
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "Evolution อยู����หม�ออ��ล�� �ุ��ม�สามาร�สร�า�หรือ��ลี�ย���ล���ล��อร��������ะ�ี�\n"
+#~ "�รุ�า��ลี�ย����าสู��หม�ออ��ล����ื�อ�ำ��ิ�ั�ิ�าร�ั��ล�าว"
+
+#~ msgid ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+#~ msgstr "รหัส��า��ั��ุ�ั��ม��ร��ั�รหัส��า��อ��ั��ี�ุ� �รุ�า��อ�รหัส��า��ี��ู���อ�"
+
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr "รหัส��า��ั��สอ�อั��ม��ร��ั� �รุ�า��อ�รหัส��า��หม�"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "ยื�ยั�รหัส��า�:"
+
+#~ msgid "Current Password:"
+#~ msgstr "รหัส��า��ั��ุ�ั�:"
+
+#~ msgid "New Password:"
+#~ msgstr "รหัส��า��หม�:"
+
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr "รหัส��า��อ��ุ����หม�อายุล��ล�ว �รุ�า��ลี�ย�รหัส��า��ั��ี"
+
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "รหัส��า��อ��ุ��ะหม�อายุล���อี� %d วั�"
+
+#~ msgid "Custom"
+#~ msgstr "�ำห���อ�"
+
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "�รร�า�ิ�าร (อ�า�, สร�า�, �����)"
+
+#~ msgid "Author (read, create)"
+#~ msgstr "�ู���ีย� (อ�า�, สร�า�)"
+
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "�ู��รว��า� (อ�า�อย�า���ียว)"
+
+#~ msgid "Delegate Permissions"
+#~ msgstr "สิ��ิ��อ��ู�รั�มอ��ั��ะ"
+
+#~ msgid "Permissions for %s"
+#~ msgstr "�าร�ำห��สิ��ิ�สำหรั� %s"
+
+#~ msgid ""
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
+#~ msgstr ""
+#~ "��อ�วาม�ี��ู�ส����ยอั���มั�ิ�า� Evolution ��ื�อ�����ห��ุ��รา�ว�า�ุ����รั��ารมอ��ั��ะ�ล�ว "
+#~ "��อ���ี� �ุ�สามาร�ส����อ�วาม���าม�อ���า����า���"
+
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr "�ุ����รั�อ�ุ�า��ห��ระ�ำ�าร��อ���ี�����ล��อร��อ���า����า:"
+
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "�ุ����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ���า����า�����วย"
+
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "����ุ��ม����รั�อ�ุ�า��ห��ูราย�ารส�ว��ัว�อ���า����า"
+
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "�ุ����รั��ารมอ��ั��ะ�ห������ัว����อ� %s"
+
+#~ msgid "Remove the delegate %s?"
+#~ msgstr "ล��ารมอ��ั��ะ�ห��ั� %s หรือ�ม�?"
+
+#~ msgid "Could not access Active Directory"
+#~ msgstr "�ม�สามาร����า��� Active Directory"
+
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "�ม����ัว�ู������ Active Directory"
+
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "�ม����ู�รั�มอ��ั��ะ %s �� Active Directory"
+
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "�ม�สามาร�ล��ู�รั�มอ��ั��ะ %s"
+
+#~ msgid "Could not update list of delegates."
+#~ msgstr "�ม�สามาร��รั���อมูลราย�ื�อ�ู�รั�มอ��ั��ะ"
+
+#~ msgid "Could not add delegate %s"
+#~ msgstr "�ม�สามาร���ิ�ม�ู�รั�มอ��ั��ะ %s"
+
+#~ msgid "Error reading delegates list."
+#~ msgstr "��ิ���อ�ิ��ลา���ะอ�า�ราย�ื�อ�ู�รั�มอ��ั��ะ"
+
+#~ msgid "C_alendar:"
+#~ msgstr "_��ิ�ิ�:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "�ู�_�ิ���อ:"
+
+#~ msgid "Delegates"
+#~ msgstr "�ู�รั�มอ��ั��ะ"
+
+#~ msgid "Permissions for"
+#~ msgstr "�าร�ำห��สิ��ิ�สำหรั�"
+
+#~ msgid ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+#~ msgstr ""
+#~ "�ู�����หล�า�ี��ะสามาร�ส���มล���าม�อ��ุ����\n"
+#~ "�ละสามาร����า�ึ���ล��อร��อ��ุ���วยสิ��ิ��ี��ุ��ำห��"
+
+#~ msgid "_Delegate can see private items"
+#~ msgstr "�ู�รั�มอ��ั��ะสามาร��ูราย�าร_ส�ว��ัว���"
+
+#~ msgid "_Inbox:"
+#~ msgstr "��หมาย�_��า:"
+
+#~ msgid "_Summarize permissions"
+#~ msgstr "_สรุ��ารอ�ุ�า�สิ��ิ�"
+
+#~ msgid "Permissions..."
+#~ msgstr "�าร�ำห��สิ��ิ�"
+
+#~ msgid "Folder Name"
+#~ msgstr "�ื�อ��ล��อร�"
+
+#~ msgid "Folder Size"
+#~ msgstr "��า��อ���ล��อร�"
+
+#~ msgid "User"
+#~ msgstr "�ู����"
+
+#~ msgid "Subscribe to Other User's Folder"
+#~ msgstr "�อ�รั���อมูล�า���ล��อร��ู����อื��"
+
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "ลำ�ั��ั����ล��อร� Exchange"
+
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "�ลิ��อ�รั���อมูล��ล��อร�..."
+
+#~ msgid "Really unsubscribe from folder \"%s\"?"
+#~ msgstr "�ลิ��อ�รั���อมูล�า���ล��อร� \"%s\" �ริ�หรือ�ม�?"
+
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "�ลิ��อ�รั���อมูล�า� \"%s\""
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>�อ��ี�ส�า�ะ�อ��ุ��ือ \"�ม�อยู��ี�สำ�ั��า�\". </b>\n"
+#~ "\n"
+#~ "�ุ���อ��าร��ลี�ย�ส�า�ะ���� \"อยู���สำ�ั��า�\" หรือ�ม�? "
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>��อ�วาม�มื�อ�ม�อยู�สำ�ั��า�:</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>ส�า�ะ:</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>��หมาย�ี�ระ�ุ��า�ล�า��ี��ะส��อั���มั�ิ��ยั��ู��ี�ส��\n"
+#~ "�มล�ึ��ุ���ะ�ี��ุ��ม�อยู�สำ�ั��า�</small>"
+
+#~ msgid "I am currently in the office"
+#~ msgstr "��ะ�ี��ั�อยู�สำ�ั��า�"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "��ะ�ี��ั��ม�อยู��ี�สำ�ั��า�"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "�ม� �ม���อ���ลี�ย�ส�า�ะ"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "�ู���วย�ั��ารส�า�ะ�ม�อยู��ี��ำ�า�"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "��ล���ลี�ย�ส�า�ะ"
+
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "�ำ��ือ�รหัส��า�หม�อายุ...."
+
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "รหัส��า��อ��ุ��ะหม�อายุล���อี� 7 วั�..."
+
+#~ msgid "_Change Password"
+#~ msgstr "�_�ลี�ย�รหัส��า�"
+
+#~ msgid "(Permission denied.)"
+#~ msgstr "(�ม����รั�อ�ุ�า�)"
+
+#~ msgid "Add User:"
+#~ msgstr "��ิ�ม�ู����:"
+
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>�าร�ำห��สิ��ิ�</b>"
+
+#~ msgid "Cannot Delete"
+#~ msgstr "ห�ามล�"
+
+#~ msgid "Cannot Edit"
+#~ msgstr "ห�าม�����"
+
+#~ msgid "Create items"
+#~ msgstr "สร�า�ราย�าร"
+
+#~ msgid "Create subfolders"
+#~ msgstr "สร�า���ล��อร�ย�อย"
+
+#~ msgid "Delete Any Items"
+#~ msgstr "ล�ราย�าร���"
+
+#~ msgid "Delete Own Items"
+#~ msgstr "ล�ราย�าร�อ����อ�"
+
+#~ msgid "Edit Any Items"
+#~ msgstr "�����ราย�าร���"
+
+#~ msgid "Edit Own Items"
+#~ msgstr "�����ราย�าร�อ����อ�"
+
+#~ msgid "Folder contact"
+#~ msgstr "�ู��ิ���อ����ล��อร�"
+
+#~ msgid "Folder owner"
+#~ msgstr "���า�อ���ล��อร�"
+
+#~ msgid "Folder visible"
+#~ msgstr "มอ��ห����ล��อร�"
+
+#~ msgid "Read items"
+#~ msgstr "อ�า�ราย�าร"
+
+#~ msgid "Role: "
+#~ msgstr "���า�: "
+
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>��า�ั���อ���อ�วาม</b>"
+
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>�ัว�ลือ��าร�ิ��าม</b>"
+
+#~ msgid "Exchange - Send Options"
+#~ msgstr "Exchange - �ัว�ลือ��อ��ารส��"
+
+#~ msgid "I_mportance: "
+#~ msgstr "ระ�ั��วาม_สำ�ั�: "
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "���ิ\n"
+#~ "สู�\n"
+#~ "��ำ"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "���ิ\n"
+#~ "ส�ว��ัว\n"
+#~ "ส�ว�\n"
+#~ "ลั�"
+
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "ร�อ��อ�าร����_รั�สำหรั���อ�วาม�ี�"
+
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "ร�อ��อ�าร����_อ�า�สำหรั���อ�วาม�ี�"
+
+#~ msgid "Send as Delegate"
+#~ msgstr "ส�����าม�ู�รั�มอ��ั��ะ"
+
+#~ msgid "_Sensitivity: "
+#~ msgstr "ระ�ั��วาม_���ิ�:"
+
+#~ msgid "_User"
+#~ msgstr "�ู��_��"
+
+#~ msgid "Select User"
+#~ msgstr "�ลือ��ู����"
+
+#~ msgid "Address Book..."
+#~ msgstr "สมุ��ี�อยู�..."
+
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "�อ�รั���อมูล�ี�อยู��ิ���อ�อ��ู����อื��"
+
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "�อ�รั���อมูล��ิ�ิ��อ��ู����อื��"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr "�ลั��อิ��ั��าร��ิ�ั�ิ�าร�ละ�ุ�ลั�ษ�ะ��า�� �ี�������าะ�ั��ั��ี Exchange"
+
+#~ msgid "Exchange Operations"
+#~ msgstr "��ิ�ั�ิ�าร��ี�ยว�ั� Exchange"
+
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr "�ม�สามาร����า������� \"��า�ั�� Exchange\" ��ะ�ำ�า����ออ��ล�����"
+
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr "�ม�สามาร���ลี�ย�รหัส��า���ื�อ��า��ั�หา��ี�ยว�ั��าร�ั����า"
+
+#~ msgid "Cannot display folders."
+#~ msgstr "�ม�สามาร��ส����ล��อร�"
+
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+#~ msgstr ""
+#~ "�าร��ลี�ย���ล���า�ั�����ั��ี Exchange \"{0}\" �ะมี�ลหลั��า��ี� Evolution "
+#~ "�ริ�ม�ำ�า��หม����า�ั��"
+
+#~ msgid "Could not authenticate to server."
+#~ msgstr "�ม�สามาร�ยื�ยั��ัว�ุ��ล�ั���ิร���วอร�"
+
+#~ msgid "Could not change password."
+#~ msgstr "�ม�สามาร���ลี�ย�รหัส��า�"
+
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "�ม�สามาร��ั����า�ั��ี Exchange ��ราะ��ิ���อ�ิ��ลา�\n"
+#~ "�ม��รา�สา�ห�ุ �รุ�า�รว�สอ� URL, �ื�อ�ู���� \n"
+#~ "�ละรหัส��า� �ล�วลอ��หม�"
+
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� Exchange"
+
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� {0}"
+
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr "�ม�สามาร��ิ�าร�าสิ��ิ�����ล��อร��อ��ู�รั�มอ��ั��ะ"
+
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr "�ม���ระ���หล���������ว���อ� Exchange"
+
+#~ msgid "Could not locate server {0}."
+#~ msgstr "หา�ำ�ห�����ิร���วอร� {0} �ม���"
+
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "�ม�สามาร�มอ��ั��ะ�ห��ั� {0} ���"
+
+#~ msgid "Could not read folder permissions"
+#~ msgstr "�ม�สามาร�อ�า���า�าร�ำห��สิ��ิ��อ���ล��อร�"
+
+#~ msgid "Could not read folder permissions."
+#~ msgstr "�ม�สามาร�อ�า���า�าร�ำห��สิ��ิ��อ���ล��อร�"
+
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "�ม�สามาร�อ�า�ส�า�ะ�าร�ม�อยู��ี��ำ�า�"
+
+#~ msgid "Could not update folder permissions."
+#~ msgstr "�ม�สามาร��รั���อมูล�าร�ำห��สิ��ิ��อ���ล��อร�"
+
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "�ม�สามาร��รั���อมูลส�า�ะ�าร�ม�อยู��ี��ำ�า�"
+
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr "Evolution ��อ��ริ�ม�ำ�า��หม���ื�อ�ะ�หล��ล�อ��มล�อ��ู�����ี��อ�รั���อมูล�ว�"
+
+#~ msgid "Exchange Account is offline."
+#~ msgstr "�ั��ี Exchange �ำ�า�ออ��ล��อยู�"
+
+#~ msgid ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+#~ msgstr ""
+#~ "�ลั��อิ���ื�อม��อ Exchange ��อ��าร����วามสามาร��า�อย�า�\n"
+#~ "�อ���ิร���วอร� Exchange �ึ���ู��ิ�หรือห�าม���อยู� (มั��ะ��ย\n"
+#~ "�ม�����า) �ู��ู�ล Exchange �อ��ุ��ำ������อ���ิ��วามสามาร��ี�\n"
+#~ "��ื�อ�ี��ุ��ะสามาร�����ลั��อิ���ื�อม��อ Exchange �อ� Evolution ���\n"
+#~ "\n"
+#~ "สำหรั���อมูล�ี��ะ�อ��ั��ู��ู�ล Exchange �อ��ุ� �รุ�า�ู�ี�ลิ�����า�ล�า��ี�:\n"
+#~ "{0}\n"
+#~ "  "
+
+#~ msgid "Folder already exists"
+#~ msgstr "มี��ล��อร�อยู��ล�ว"
+
+#~ msgid "Folder does not exist"
+#~ msgstr "�ม�มี��ล��อร��ี�อ�า�"
+
+#~ msgid "Folder offline"
+#~ msgstr "��ล��อร�ออ��ล��อยู�"
+
+#~ msgid "Generic error"
+#~ msgstr "��อ�ิ��ลา��ั�ว��"
+
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "�ิ���อ��ิร���วอร� Global Catalog �ม����"
+
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
+#~ msgstr "��า OWA �ำลั��ำ�า����า�อื�� �ุ���อ�ระ�ุ�า��ั��ล�าว���ล�อ�����อ��ั����า�ั��ี"
+
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "�ล�อ��มลสำหรั� {0} �ม�อยู�����ิร���วอร��ี�"
+
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "�รุ�า�รว�สอ��ห������ว�า URL �ู���อ� �ล�วลอ��หม�อี��รั��"
+
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr "�รุ�า�รว�สอ��ห������ว�า�ุ�สะ���ื�อ��ิร���วอร��ู���อ� �ล�วลอ��หม�อี��รั��"
+
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr "�รุ�า�รว�สอ��ห������ว�า�ื�อ�ู�����ละรหัส��า��ู���อ� �ล�วลอ��หม�อี��รั��"
+
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr "�ม�����ั����า��ิร���วอร� Global Catalog สำหรั��ั��ี�ี��ว�"
+
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "�ม�มี�ล�อ��มลสำหรั��ู���� {0} �ี� {1}"
+
+#~ msgid "No such user {0}"
+#~ msgstr "�ม�มี�ู���� {0} �ี�อ�า�"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "��ลี�ย�รหัส��า�สำ�ร���ล�ว"
+
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr "�รุ�า��อ��ื�อ�อ��ู�รั�มอ��ั��ะ หรือย��ลิ��ัว�ลือ��ารส�����าม�ู�รั�มอ��ั��ะ"
+
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr "�รุ�า�รว��ู�ห������ว�า�ื�อ��ิร���วอร� Global Catalog �ู���อ�"
+
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "�รุ�า�ริ�ม Evolution �หม� ��ื�อ�ห��าร��ลี�ย���ล�มี�ล"
+
+#~ msgid "Please select a user."
+#~ msgstr "�รุ�า�ลือ��ู����"
+
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "��ิร���วอร���ิ�ส�รหัส��า���ราะ��า��าย��ิ���"
+
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "�ั��ี Exchange �ะ�ู��ิ��มื�อ�ุ�ออ��า� Evolution"
+
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "�ั��ี Exchange �ะ�ู�ล��มื�อ�ุ�ออ��า� Evolution"
+
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "��ิร���วอร� Exchange ���า�ั��ม�����ั��ลั��อิ���ื�อม��อ Exchange"
+
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "��ิร���วอร���� Exchange 5.5 ����ะ�ี��ลั��อิ���ื�อม��อ Exchange \n"
+#~ "รอ�รั� Microsoft Exchange 2000 �ละ 2003 ���า�ั��"
+
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "��อ�ิ��ลา��ี� อา�หมาย�วามว�า ��ิร���วอร��อ��ุ���อ��าร�ห��ุ� \n"
+#~ "ระ�ุ�ื�อ���ม�วิ���วส����ื�อ�ู�����อ��ุ���วย (���� &quot;DOMAIN\\user&quot;)\n"
+#~ "\n"
+#~ "หรือ�ุ�อา������อ�รหัส��า��ิ����า�ั���อ�"
+
+#~ msgid "Try again with a different password."
+#~ msgstr "�รุ�าลอ��ั��รหัส��า��หม�"
+
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "�ม�สามาร���ิ�ม�ู������ราย�าร�ว��ุม�าร���า�ึ�:"
+
+#~ msgid "Unable to edit delegates."
+#~ msgstr "�ม�สามาร�������ารมอ��ั��ะ"
+
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุ��ะ��ิ�หา {0}"
+
+#~ msgid "Unknown type"
+#~ msgstr "��ิ��ม�รู��ั�"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "�ู����ย��ลิ���ิ�ั�ิ�าร"
+
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
+#~ msgstr "�ุ������ว�าสำหรั������มล����ิร���วอร��ี���ล��ะ���ม�ล�ว"
+
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr "�ุ�สามาร�ส����อ�วาม���าม�อ��ู�มอ��ั��ะ�����ีย��ีละห�ึ�������า�ั��"
+
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "�ุ��ม�สามาร�มอ��ั��ะ�าร�ระ�ุม�ห��ัว�อ����"
+
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "�ุ���������ื�อ�ี������มล����ิร���วอร��ี���ิ���ว�า�ี��ำห���ล�ว"
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+#~ msgstr "�าร����า��อ��ุ���ะ�ี��ือ: {0} KB  �รุ�า��ลียร���ื�อ�ี���ยล��มล�า�ส�ว�"
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr "�าร����า��อ��ุ���ะ�ี��ือ: {0} KB  �ุ��ะ�ม�สามาร�รั�หรือส���มล���"
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "�าร����า��อ��ุ���ะ�ี��ือ: {0} KB  �ุ��ะ�ม�สามาร�ส���มล��� "
+#~ "���ว�า�ะ��ลียร���ื�อ�ี���ยล��มล�า�ส�ว�"
+
+#~ msgid "Your password has expired."
+#~ msgstr "รหัส��า��อ��ุ�หม�อายุ�ล�ว"
+
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "�ม�สามาร���ิ�ม {0} ล���ราย�าร�ว��ุม�าร���า�ึ����"
+
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} �����ู�รั�มอ��ั��ะ�ระ�ุมอยู��ล�ว"
+
+#~ msgid "{0} is already in the list"
+#~ msgstr "{0} อยู���ราย�ื�ออยู��ล�ว"
+
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "�อ�รั���อมูลภาร�ิ��อ��ู����อื��"
+
+#~ msgid "Check folder permissions"
+#~ msgstr "�รว�สอ��าร�ำห��สิ��ิ��อ���ล��อร�"
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "��ีย���อ�วาม��ย�����รื�อ�มือ��ีย���อ�วามภาย�อ�"
+
+#~ msgid "Select a (48*48) png of size < 700bytes"
+#~ msgstr "�ลือ�รู� png ��า� 48x48 �ุ� �ี��ห���ม���ิ� 700 ����"
+
+#~ msgid "PNG files"
+#~ msgstr "���ม PNG"
+
+#~ msgid "_Face"
+#~ msgstr "รู�_��าย"
+
+#~ msgid ""
+#~ "Attach Face header to outgoing messages. First time the user needs to "
+#~ "configure a 48*48 png image. It is base64 encoded and stored in ~/."
+#~ "evolution/faces This will be used in messages that are sent further."
+#~ msgstr ""
+#~ "���รู���าย��ส�ว�หัว�อ���อ�วาม�ี�ส��ออ� ���รั���ร� �ุ��ะ��อ��ำห��รู� png ��า� 48x48 "
+#~ "�ุ��สีย��อ� รู��ี��ะ�ู�������รู���� base64 �����ม ~/.evolution/faces "
+#~ "�ละ�ะ�ู��������อ�วาม�ี�ส��ออ��รั����อ� ��"
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr "��วยย��ลิ��าร�อ�รั���อมูล��ล��อร��มล��า��ม�ู�ลิ��วา�ี������า�"
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "�ลิ��อ�รั���อมูล��ล��อร�"
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "�ลั��อิ��ั����า��ิ�ิ��ละ�ี�อยู��ิ���อ�ู��ิล"
+
+#~ msgid "Google sources"
+#~ msgstr "�หล���ู��ิล"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "�ลั��อิ��ั����า��ิ�ิ��ละ�หล���ี�อยู��ิ���อ�อ� GroupWise"
+
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "�าร�ั����า�ั��ี GroupWise"
+
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>ราย�าร�มล�ยะ:</b>"
+
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>�ื�อ</b>"
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "�ลั��อิ��ั����า�หล����ิ�ิ� hula"
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "�ั����า�ั��ี Hula"
+
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>��อมูลส�ว�หัว�ำห���อ�</b>"
+
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "<b>��อมูลส�ว�หัว IMAP</b>"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "�ลั��อิ�สำหรั��าร����า��ั��ี IMAP"
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "�ำ�_��า��ยั���ิ�ิ�"
+
+#~ msgid "Import ICS"
+#~ msgstr "�ำ���า ICS"
+
+#~ msgid "_Import"
+#~ msgstr "�ำ�_��า"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "�ำ���า���ม������ ICS ล�����ิ�ิ�"
+
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "�ม�����หล� Hardware Abstraction Layer �ว�"
+
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "��อ�����ริ�าร \"hald\" ����ม�มี�ริ�าร�ั��ล�าว�ำ�า�อยู� �รุ�า��ิ��ริ�าร�ั��ล�าว "
+#~ "�ล�ว�รีย���ร��รม�ี��หม� หรือ�ิ���อ�ู��ู�ลระ���อ��ุ�"
+
+#~ msgid ""
+#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+#~ msgstr ""
+#~ "Evolution หา�อ�อ��ี��ะ sync ��วย�ม��� อา��ะ�ม������ื�อม��ออยู� หรืออา��ะ�ม������ิ�สวิ���"
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr "�รั���อมูลภาร�ิ�/�ั��ึ���วย�ำ/��ิ�ิ�/สมุ��ี�อยู� �ห��ร��ั� Apple iPod"
+
+#~ msgid "Synchronize to iPod"
+#~ msgstr "�รั���อมูล�ห��ร��ั� iPod"
+
+#~ msgid "_Tasks :"
+#~ msgstr "_ภาร�ิ� :"
+
+#~ msgid "Memos :"
+#~ msgstr "�ั��ึ���วย�ำ :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "�ห��ลือ��ิ�����ั��ี���"
+
+#~ msgid "Specify _filename:"
+#~ msgstr "_ระ�ุ�ื�อ���ม:"
+
+#~ msgid "Pl_ay"
+#~ msgstr "�_ล��"
+
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "ส����อ�วาม D-Bus หรือ������ือ��ู������วย�อ�อ����ื���ี������ห�ุ�ละ��อ�วาม������ือ� "
+#~ "�มื�อมี��อ�วาม���ามา�หม�"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr "�ลั��อิ���วยสร�า��าร�ระ�ุม�า���ื�อหา��อ�วาม���มล"
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "�_�ล��������าร�ระ�ุม"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "�า��มล�����าร�ระ�ุม"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr "�ลั��อิ���วยสร�า�ภาร�ิ��า���ื�อหา��อ�วาม���มล"
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "�_�ล�������ภาร�ิ�"
+
+#~ msgid "Mail to task"
+#~ msgstr "�า��มล����ภาร�ิ�"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "�ิ���อ�_��า�อ�ลิส��"
+
+#~ msgid "Get list _archive"
+#~ msgstr "�ู_�รุ��อ�วาม���า�อ�ลิส��"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "�ู��อมูล_วิ�ี����อ�ลิส��"
+
+#~ msgid "_Post message to list"
+#~ msgstr "_ส����อ�วาม���าลิส��"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "ส_มั�ร���าลิส��"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "ย��_ลิ��ารสมั�ร���าลิส��"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "����ำ��รื�อ�หมาย�ุ���อ�วาม�����ล��อร��ี��ำห��ว�าอ�า��ล�ว"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "�ลั��อิ���ื�อม��อ�ลั��อิ� Mono"
+
+#~ msgid "Mono Loader"
+#~ msgstr "�ลั��อิ��หล� Mono"
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "�ลั��อิ�สำหรั��ั��าร��ิ�-�ิ��ลั��อิ���า��"
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "�ลั��อิ���สอ� �ึ��สา�ิ��ลั��อิ��ั��รีย���อ�วาม �ห��ุ��ลือ��ี��ะ�ิ��าร�����อ�วาม��� HTML ���\n"
+#~ "\n"
+#~ "�ลั��อิ��ี�������ีย�����สา�ิ��ี��ม�มี�าร�ู�ล���า�ั��\n"
+
+#~ msgid "Prefer PLAIN"
+#~ msgstr "�ส����อ�วาม��ล�า��า���������"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "��ีย��ั��ึ��ห�ุ�าร���ี���ี�ยว�ั���อมูล�ารวั��ระสิ��ิภา�"
+
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">�ำ�ห���</span>"
+
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">�หล��</span>"
+
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+#~ msgstr ""
+#~ "FTP �ิรภัย (SSH)\n"
+#~ "FTP สา�าร�ะ\n"
+#~ "FTP (ล�อ�อิ�)\n"
+#~ "��ล��อร����ร�วม�อ�วิ���วส�\n"
+#~ "WebDAV (HTTP)\n"
+#~ "WebDAV �ิรภัย (HTTPS)\n"
+#~ "�ำ�ห����ำห���อ�"
+
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "iCal\n"
+#~ "ว�า�/�ม�ว�า�"
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "�ลั��อิ��ึ���หล��ลั��อิ�อื���ี���ีย���วยภาษา���อ�"
+
+#~ msgid "Python Loader"
+#~ msgstr "�ัว�หล����อ�"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (�ั����ัว)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr "�รอ���อ�วาม�ยะ��วย SpamAssassin  �าร����ลั��อิ��ี� ��อ��ิ��ั�� SpamAssassin ��วย"
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "�ลั��อิ�สำหรั��ั��ึ����ม���หรือส�ว���า�� �อ���อ�วาม���ราว��ียว"
+
+#~ msgid "Save Attachments..."
+#~ msgstr "�ั��ึ����ม���..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "�ั��ึ����ม����ั��หม�"
+
+#~ msgid "Select save base name"
+#~ msgstr "�ลือ��ื�อ���สำหรั��าร�ั��ึ�"
+
+#~ msgid "_Save to Disk"
+#~ msgstr "_�ั��ึ�ล��ิส��"
+
+#~ msgid "Select one source"
+#~ msgstr "�ลือ��หล����ียว"
+
+#~ msgid "Selects a single calendar or task source for viewing."
+#~ msgstr "�ลือ��หล����ิ�ิ�หรือภาร�ิ���ีย��หล����ียว��ื�อ�ู"
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "�รว�สอ�ว�า�าร�รีย��ระ�ู��อ���อ�วาม�วร�ยายาม����าร�รีย��าม�ื�อ�รื�อ�หรือ�ม�"
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "�ลั��อิ�อย�า���าย�ี���� yTNEF อ�า����ม��� TNEF"
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "�ลั��อิ��ั����า�ี�อยู��ิ���อ WebDAV"
+
+#~ msgid "Evolution Shell"
+#~ msgstr "��ลล� Evolution"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "�ร��า��ั����า��ลล� Evolution"
+
+#~ msgid "Evolution Test"
+#~ msgstr "��สอ� Evolution"
+
+#~ msgid "Evolution Test component"
+#~ msgstr "อ����ระ�อ���สอ� Evolution"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>�าร��ื�อม��อ�ี��ำ�า�อยู�</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "�าร��ื�อม��อ�ี��ำ�า�อยู�"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr "�ลิ� \"��ล�\" ��ื�อ�ิ��าร��ื�อม��อ�หล�า�ี� �ล�ว��ลี�ย������หม�ออ��ล��"
+
+#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#~ msgstr "�ม�����รื�อ�มือ GNOME Pilot �ิ��ั����ระ��"
+
+#~ msgid "Error executing %s."
+#~ msgstr "��ิ���อ�ิ��ลา���ะ�รีย���� %s"
+
+#~ msgid "Work Offline"
+#~ msgstr "�ำ�า�ออ��ล��"
+
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "Evolution �ำลั���ลี�ย��าร�ำ�า�����ออ��ล��"
+
+#~ msgid "Unknown system error."
+#~ msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ�อ�ระ��"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "อาร��ิว�ม����ิ��ลา�"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "�ม�สามาร�ล��ะ��ีย��ั� OAF"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "�ม����า���อมูล��า�ั��"
+
+#~ msgid "New Test"
+#~ msgstr "�าร��สอ��หม�"
+
+#~ msgid "Import File"
+#~ msgstr "�ำ���า���ม"
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "�ม�สามาร��ริ�ม�าร�ำ�า��อ� Evolution"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "Evolution �ริ�ม�ำ�า��ม�สำ�ร��"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr ""
+#~ "��า�ั��ระ���อ��ุ��ม��ร��ั���า�ั���อ� Evolution\n"
+#~ "\n"
+#~ "�ลิ�วิ�ี�����ื�อ�ูรายละ�อีย�"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "��า�ั��ระ���อ��ุ��ม��ร��ั���า�ั���อ� Evolution\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "�ลิ�วิ�ี�����ื�อ�ูรายละ�อีย�"
+
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>��า�อ������อมูล</b>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>ลาย�ิ�วมือ</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>ออ��ห���ย</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>ออ��ห��ั�</b>"
+
+#~ msgid "Dummy window only"
+#~ msgstr "ห��า��า�หุ�����า�ั��"
+
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "�ำลั��ิ� %s (%s)\n"
+
+#~ msgid "Copy"
+#~ msgstr "�ั�ลอ�"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "�ั�ลอ���ยั���ล��อร�..."
+
+#~ msgid "Create a new address book folder"
+#~ msgstr "สร�า���ล��อร�สมุ��ี�อยู��หม�"
+
+#~ msgid "Cut"
+#~ msgstr "�ั�"
+
+#~ msgid "Forward Contact"
+#~ msgstr "ส����อ�ี�อยู��ิ���อ"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "ย�าย��ยั���ล��อร�..."
+
+#~ msgid "Paste"
+#~ msgstr "��ะ"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "�ั��ึ����� VCard..."
+
+#~ msgid "Select _All"
+#~ msgstr "�ลือ��ั��_หม�"
+
+#~ msgid "Send message to contact"
+#~ msgstr "ส����อ�วาม��ยั��ู��ิ���อ"
+
+#~ msgid "St_op"
+#~ msgstr "_หยุ�"
+
+#~ msgid "Stop"
+#~ msgstr "หยุ�"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "_�ั�ลอ��ู��ิ���อ����ล��อร���ยั�"
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "_ย�าย�ู��ิ���อ����ล��อร���ยั�"
+
+#~ msgid "_Rename"
+#~ msgstr "��ลี�ย�_�ื�อ"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "_�ั��ึ��ู��ิ���อ��รู� VCard..."
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "_�ั��ึ��ู��ิ���อ����ล��อร���รู� VCard"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "ล�_�ุ�รอ��อ��ั�หมาย�ี�"
+
+#~ msgid "Show the working week"
+#~ msgstr "�ส��สั��าห��าร�ำ�า�"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "�ส���อ���ล�ี�ั����ื�อ�ู��อ�วาม�ั��ึ�"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "�ั��ึ�สำหรั��าร_�ี�ั��:"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "�ส���ัวอย�า���อ�วาม��า�� ราย�าร��อ�วาม��วย"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "�ั�ลอ���อ�วาม�ี��ลือ����า�ลิ��อร��"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "�ั���อ�วาม�ี��ลือ����า�ลิ��อร��"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "��ะ��อ�วาม�า��ลิ��อร��"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "�ลือ���อ�วาม_�ั��หม�"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr "�ลั��าร�ลือ����ลือ���อ�วาม�ี��ม�����ลือ�อยู�"
+
+#~ msgid "Not Junk"
+#~ msgstr "�ม�����ยะ"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "��ะ��อ�วาม�ี��ลือ��า��ลิ��อร��"
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "��ะ_�ระ�าศ��ยั���ล��อร�"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "��ะ�ระ�าศ�อ_�"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "��ะ�ระ�าศ��ยั���ล��อร�สา�าร�ะ"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "��ะ�ระ�าศ�อ���อ�วาม����ล��อร�สา�าร�ะ"
+
+#~ msgid "Select _All Text"
+#~ msgstr "�ลือ���ื�อ�วาม�ั��_หม�"
+
+#~ msgid "_Save Message..."
+#~ msgstr "_�ั��ึ���อ�วาม..."
+
+#~ msgid "Main toolbar"
+#~ msgstr "�����รื�อ�มือหลั�"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "�ั�ลอ��ั��ึ���อ�วาม�ี��ลือ�"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "�ั��ั��ึ���อ�วาม�ี��ลือ�"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "�ั�ลอ�ภาร�ิ��ี��ลือ�"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "�ั�ภาร�ิ��ี��ลือ�"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "�ำ�_�รื�อ�หมายว�า�สร���ล�ว"
+
+#~ msgid "Show task preview window"
+#~ msgstr "�ส����อ�ห��า��า��ส���ัวอย�า�ภาร�ิ�"
+
+#~ msgid "About Evolution..."
+#~ msgstr "��ี�ยว�ั� Evolution..."
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "��อ�/�ส�������รื�อ�มือ"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr "ล�รหัส��า��ี��ำ�ว��ิ�� �ล�ว�ามรหัส��า��หม����รั����อ��"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "��อ��ุ�มห��า��า�"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "�ั��_ห��า�ระ�าษ..."
+
+#~ msgid "Prefere_nces"
+#~ msgstr "_�รั�����"
+
+#~ msgid "Send / Receive"
+#~ msgstr "รั� / ส��"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "ส��ราย�า��ุ����ร�อ�"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "��ิ�/�ิ�ส�า�ะ�าร�ำ�า�ออ��ล��"
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "��อ�/�ส�������า�"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "��อ�/�ส�����ส�า�ะ"
+
+#~ msgid "Work _Offline"
+#~ msgstr "�ำ�า�ออ_��ล��"
+
+#~ msgid "_About"
+#~ msgstr "�_�ี�ยว�ั�"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "�ำ_�าม�ี��าม��อย"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "��อ_��ุ�ม"
+
+#~ msgid "_Quit"
+#~ msgstr "_ออ�"
+
+#~ msgid "_Synchronization Options..."
+#~ msgstr "_�ัว�ลือ��าร sync..."
+
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>����วลา</b>"
+
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>�าร_�ลือ�</b>"
+
+#~ msgid "Save Custom View"
+#~ msgstr "�ั��ึ�มุมมอ��ำห���อ�"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "������ม���"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "�ม�สามาร�������ม %s: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "�ม�สามาร�������ม %s: �ม�������ม���ิ"
+
+#~ msgid "MIME type:"
+#~ msgstr "��ิ� MIME:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "�ห��ส�����ม����ี���ยอั���มั�ิ"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "�ุ�อั��ระ�ี��ม�รู��ั�: %s"
+
+#~ msgid "Expanded"
+#~ msgstr "�ยายอยู�"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "ระ�ุว�าวิ�����ยุ�-�ยาย�ยายอยู�หรือ�ม�"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "��อ�วาม�ี���าย�อ�วิ�����ยุ�-�ยาย"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr "��า�ลือ� อั��ระ�ี��ส���������อ�วาม�ะระ�ุว�าอั��ระ�ั����ะ�������รหัส�ุ�มลั�"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "��อ�ว�า�ระหว�า���าย�ละวิ�����"
+
+#~ msgid "Label widget"
+#~ msgstr "วิ�������าย"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "วิ������ี��ะ����ส���ล�����าย���ิ�อ�วิ�����ยุ�-�ยาย"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "��อ���รอ�ลู�ศรยุ�-�ยาย"
+
+#~ msgid "_Searches"
+#~ msgstr "�าร_���หา"
+
+#~ msgid "Current Message"
+#~ msgstr "��อ�วาม�ั��ุ�ั�"
+
+#~ msgid "Choose Image"
+#~ msgstr "�ลือ�รู�ภา�"
+
+#~ msgid "Empty message"
+#~ msgstr "��อ�วามว�า���ล�า"
+
+#~ msgid "Reflow model"
+#~ msgstr "�ม��ล��อมูล�าร�ั��รีย��ระ�ส��อ�วาม"
+
+#~ msgid "Column width"
+#~ msgstr "�วาม�ว�า��อลัม��"
+
+#~ msgid "Search"
+#~ msgstr "���หา"
+
+#~ msgid "_Clear"
+#~ msgstr "_ล�า�"
+
+#~ msgid "Item ID"
+#~ msgstr "หมาย�ล�ราย�าร"
+
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>�อ��ลั�</b>"
+
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>�าร�ิ��ามส�า�ะ</b>"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "���ิ\n"
+#~ "ส�ว��ัว\n"
+#~ "ลั�\n"
+#~ "ลั�มา�\n"
+#~ "ลั��ี�สุ�\n"
+#~ "�ู�ล�ว�ำลาย"
+
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "�ม��ำห��\n"
+#~ "สู�\n"
+#~ "���ิ\n"
+#~ "��ำ"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "�����ราย�ื�อหมว��ม����..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "สิ���ี��ั�อยู���_หมว��ี�:"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "_หมว��ี�มี:"
+
+#~ msgid "categories"
+#~ msgstr "หมว�"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "DnD code"
+#~ msgstr "รหัส DnD"
+
+#~ msgid "Full Header"
+#~ msgstr "��อมูลส�ว�หัว���ม"
+
+#~ msgid "Add a column..."
+#~ msgstr "��ิ�ม�อลัม��..."
+
+#~ msgid "Field Chooser"
+#~ msgstr "��รื�อ�มือ�ลือ���อ���อมูล"
+
+#~ msgid "Font Description"
+#~ msgstr "�ำ�รรยาย���อั�ษร"
+
+#~ msgid "Tree"
+#~ msgstr "����ม�"
+
 #~ msgid "Novell Groupwise"
 #~ msgstr "Novell Groupwise"
 
@@ -23758,9 +25522,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "This should test the contact print style editor widget"
 #~ msgstr "��สอ�วิ����������ส��ล��าร�ิม���ี�อยู��ิ���อ"
 
-#~ msgid "Contact Print Test"
-#~ msgstr "�าร��สอ��าร�ิม���ี�อยู��ิ���อ"
-
 #~ msgid "This should test the contact print code"
 #~ msgstr "��สอ��าร�ิม���ี�อยู��ิ���อ"
 
@@ -23786,7 +25547,7 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgstr "�าร��อวย�รวั�หยุ�"
 
 #~ msgid "Hot Contacts"
-#~ msgstr "�ี�อยู��ิ���อยอ��ิยม"
+#~ msgstr "�ู��ิ���อยอ��ิยม"
 
 #~ msgid "Ideas"
 #~ msgstr "��ว�ิ�"
@@ -23797,9 +25558,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Key Customer"
 #~ msgstr "ลู���าสำ�ั�"
 
-#~ msgid "Miscellaneous"
-#~ msgstr "������ล��"
-
 #~ msgid "Next 7 days"
 #~ msgstr "7 วั���า�ห��า"
 
@@ -23809,9 +25567,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Strategies"
 #~ msgstr "�ลยุ���"
 
-#~ msgid "Suppliers"
-#~ msgstr "�ู��ลิ���อ�"
-
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "�วลา &amp; ��า�����าย"
 
@@ -23827,9 +25582,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Weather: Partly Cloudy"
 #~ msgstr "สภา�อา�าศ: ��อ���ามี�ม��า�ส�ว�"
 
-#~ msgid "Please enter user name first."
-#~ msgstr "�รุ�า��อ��ื�อ�ู������อ�"
-
 #~ msgid "Error opening the FAQ webpage."
 #~ msgstr "��ิ���อ�ิ��ลา���ะ��ิ��ว��ห��า�ำ�าม�ี��าม��อย"
 
@@ -23908,15 +25660,9 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Updating query"
 #~ msgstr "�ำลั��รั���อมูล�ารสื����"
 
-#~ msgid "Unknown reason"
-#~ msgstr "�ม��รา�สา�ห�ุ"
-
 #~ msgid "Open File"
 #~ msgstr "��ิ����ม"
 
-#~ msgid "_Save Message"
-#~ msgstr "_�ั��ึ���อ�วาม"
-
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "�ม�สามาร���ิ����ม &quot;{0}&quot;"
 
@@ -23935,9 +25681,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Enter a name for this signature."
 #~ msgstr "�รุ�า��อ��ื�อสำหรั�ลาย�����ี�"
 
-#~ msgid "Name:"
-#~ msgstr "�ื�อ:"
-
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
@@ -23965,9 +25708,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Enable attachment reminder plugin."
 #~ msgstr "��ิ�����ลั��อิ���ือ��าร������ม"
 
-#~ msgid "Remind _missing attachments"
-#~ msgstr "��ือ��มื�อ_�า����ม���"
-
 #~ msgid "_Refresh:"
 #~ msgstr "�_หล��หม�:"
 
@@ -24007,9 +25747,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "'.' �ละ '..' �����ื�อ��ล��อร��ี�ส�ว��ว�"
 
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "�ั�ลอ�ส�ว��ี��ลือ����า�ลิ��อร��"
-
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "�ั�ส�ว��ี��ลือ����า�ลิ��อร��"
 
@@ -24064,9 +25801,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "ส���มล��รู���� HTML"
 
-#~ msgid "_Delete all"
-#~ msgstr "_ล��ั��หม�"
-
 #~ msgid "_Open..."
 #~ msgstr "��ิ_�..."
 
@@ -24103,9 +25837,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Status Details"
 #~ msgstr "รายละ�อีย�ส�า�ะ"
 
-#~ msgid "Time Zone"
-#~ msgstr "����วลา"
-
 #~ msgid "TimeZone Combobox"
 #~ msgstr "�ล�อ��อม������วลา"
 
@@ -24121,15 +25852,9 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "��ร��ี�อยู�อี�มล�า�สมุ��ี�อยู�"
 
-#~ msgid "Members"
-#~ msgstr "สมา�ิ�"
-
 #~ msgid "Remove an email address from the List"
 #~ msgstr "ล��ี�อยู�อี�มล�า�ราย�ื�อ"
 
-#~ msgid "_Select"
-#~ msgstr "�_ลือ�"
-
 #~ msgid "Or_ganiser:"
 #~ msgstr "�ู�_�ระสา��า�:"
 
@@ -24184,11 +25909,8 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Attachment Reminder Preferences"
 #~ msgstr "�รั������ลั��อิ���ือ��าร������ม"
 
-#~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "�ลือ�รู� png ��า� 48x48 �ุ� �ี��ห���ม���ิ� 720 ����"
-
 #~ msgid "_Contacts..."
-#~ msgstr "_�ี�อยู��ิ���อ..."
+#~ msgstr "�ู�_�ิ���อ..."
 
 #~ msgid "Every time a new mail arrives, pop up a libnotify notification."
 #~ msgstr "�ุ��ล�อ�������ือ��อ� libnotify �ุ��รั���ี�มี�มล�หม�มา�ึ�"
@@ -24205,9 +25927,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "�ั��ี�ม�สามาร�ส��อีิ�มล���"
 
-#~ msgid "No store available"
-#~ msgstr "�ม�มี�หล������สำหรั�����า�"
-
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
@@ -24247,7 +25966,7 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
-#~ "อี�มลหรือ�ื�อ�ี���ลี�ย�สำหรั��ี�อยู��ิ���อ�ี�มีอยู�����ล��อร��ี��รีย�ร�อย�ล�ว\n"
+#~ "อี�มลหรือ�ื�อ�ี���ลี�ย�สำหรั��ู��ิ���อ�ี�มีอยู�����ล��อร��ี��รีย�ร�อย�ล�ว\n"
 #~ "�ุ�ยั���อ��าร�ะ��ิ�ม���า��อี�หรือ�ม�?"
 
 #~ msgid "Valid signature, cannot verify sender"
@@ -24295,9 +26014,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Journal information"
 #~ msgstr "��อมูล�ั��ึ�"
 
-#~ msgid "Check Evolution archive"
-#~ msgstr "�รว�สอ����ม�ั�������อมูล���า Evolution"
-
 #~ msgid "With GUI"
 #~ msgstr "��� GUI"
 
@@ -24355,9 +26071,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Print envelope"
 #~ msgstr "�ิม���อ���หมาย"
 
-#~ msgid "Print contacts"
-#~ msgstr "�ิม���ี�อยู��ิ���อ"
-
 #~ msgid "Print contact"
 #~ msgstr "�ิม���ี�อยู��ิ���อ"
 
@@ -24388,9 +26101,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Calendar Group"
 #~ msgstr "�ลุ�ม��ิ�ิ�"
 
-#~ msgid "Calendar Location"
-#~ msgstr "�ำ�ห�����ิ�ิ�"
-
 #~ msgid "Calendar Name"
 #~ msgstr "�ื�อ��ิ�ิ�"
 
@@ -24418,15 +26128,9 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Free/Busy Publishing Settings"
 #~ msgstr "�ั����า�าร�ระ�าศ�ารว�า�/�ม�ว�า�"
 
-#~ msgid "_Daily"
-#~ msgstr "�ระ�ำ_วั�"
-
 #~ msgid "_Manual"
 #~ msgstr "_สั���อ�"
 
-#~ msgid "_Weekly"
-#~ msgstr "�ระ�ำ_สั��าห�"
-
 #~ msgid "Enter the password for %s"
 #~ msgstr "��อ�รหัส��า�สำหรั� %s"
 
@@ -24560,9 +26264,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "Importing Netscape data"
 #~ msgstr "�ำลั��ำ���า��อมูล����ส���"
 
-#~ msgid "Settings"
-#~ msgstr "��า�ั��"
-
 #~ msgid "Mail Filters"
 #~ msgstr "�ัว�รอ��มล"
 
@@ -24613,15 +26314,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "New mail notify"
 #~ msgstr "�����มล��ั��หม�"
 
-#~ msgid "An attachment to add."
-#~ msgstr "���ม����ี��ะ��ิ�ม"
-
-#~ msgid "Content type of the attachment."
-#~ msgstr "��ิ���ื�อหา�อ����ม���"
-
-#~ msgid "The filename to display in the mail."
-#~ msgstr "�ื�อ���ม�ี��ะ�ส�����มล"
-
 #~ msgid "Description of the attachment."
 #~ msgstr "�ำ�รรยาย�อ����ม���"
 
@@ -24692,9 +26384,6 @@ msgstr "�ั��ารห��า��า��ุ��ึ��"
 #~ msgid "personal"
 #~ msgstr "ส�ว��ุ��ล"
 
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "��ิ�ิ��ี��ุ��ลือ��ว�สามาร�อ�า�������า�ั��"
-
 #~ msgid "Memo:"
 #~ msgstr "�ั��ึ���วย�ำ:"