[empathy/gnome-2-28] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit 10653b7cfa0392e5e57a99e587653cb33db6d822
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Mon Oct 5 22:18:56 2009 +0700

    Updated Thai translation.

 po/th.po | 2466 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1683 insertions(+), 783 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index 1092c3c..d55dc4c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,22 +6,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-10 18:55+0700\n"
-"PO-Revision-Date: 2009-04-10 18:58+0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-10-02 16:41+0000\n"
+"PO-Revision-Date: 2009-10-05 22:17+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy: ��ร��รม��อ�วาม�ั���"
+msgid "Empathy"
+msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "รั��ละส����อ�วาม�ั���"
+msgid "Empathy IM Client"
+msgstr "ลู���าย��อ�วาม�ั��� Empathy"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "��ร��รมลู���าย��อ�วาม�ั���"
+
+#: ../data/empathy.desktop.in.in.h:4
+msgid "Send and receive messages"
+msgstr "รั��ละส����อ�วาม"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -47,261 +57,355 @@ msgid "Compact contact list"
 msgstr "ราย�ื�อ�ู��ิ���อ����ระ�ั�"
 
 #: ../data/empathy.schemas.in.h:6
+msgid "Connection managers should be used"
+msgstr "�����ร��รม�ั��าร�าร��ื�อม��อ"
+
+#: ../data/empathy.schemas.in.h:7
 msgid "Contact list sort criterium"
 msgstr "วิ�ี�รีย�ลำ�ั��ื�อ�ู��ิ���อ"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "���ร��อรี�ริยาย�ี��ะ����ลือ�รู�����ัว"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "�ิ��าร�ุ���อ�วาม�����ห�ุ�มื�อ�ม�อยู�"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
 msgid "Disable sounds when away"
 msgstr "�ิ��าร����สีย��มื�อ�ม�อยู�"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can publish the user's location"
+msgstr "Empathy สามาร��ระ�าศ�ำ�ห����ี��ั���อ��ู�������"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy สามาร���� GPS ���าร��า�ำ�ห����ี��ั��"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy สามาร������รือ��าย��รศั���มือ�ือ���าร��า�ำ�ห����ี��ั��"
+
+#: ../data/empathy.schemas.in.h:14
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy สามาร������รือ��าย���าร��า�ำ�ห����ี��ั��"
+
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy default download folder"
 msgstr "��ล��อร��าว���หล��ริยาย�อ� Empathy"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี���ล�ว"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:17
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy �วร��ื�อม��อ��ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy �วรล��วามละ�อีย��อ��ำ�ห����ี��ั��"
+
+#: ../data/empathy.schemas.in.h:19
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy �วร���รู�����ัว�อ��ู��ิ���อ�����อ�อ��อ�ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable WebKit Developer Tools"
+msgstr "��ิ������รื�อ�มือ�ั��า�อ� WebKit"
+
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable popup notifications for new messages"
 msgstr "��ิ�����าร�ุ���อ�วาม�����ห�ุสำหรั���อ�วาม�หม�"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:22
 msgid "Enable spell checker"
 msgstr "��ิ�����าร�รว��ัวสะ��"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide main window"
 msgstr "��อ�ห��า��า�หลั�"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:24
 msgid "Hide the main window."
 msgstr "��อ�ห��า��า�หลั�"
 
-#: ../data/empathy.schemas.in.h:18
-msgid "NetworkManager should be used"
-msgstr "��� NetworkManager"
+#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr "����ำ���า�ั��ี MC 4 �ล�ว"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr "����ำ���า�ั��ี MC 4 ���ล�ว"
+
+#: ../data/empathy.schemas.in.h:27
 msgid "Nick completed character"
 msgstr "อั��ระ��ิม��าย�ื�อ�รีย�"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:28
 msgid "Open new chats in separate windows"
 msgstr "��ิ��ารส���า�หม���ห��า��า��ย�"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:29
+msgid "Path of the adium theme to use"
+msgstr "�า��อ��ุ������� adium �ี��ะ���"
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "�า��อ��ุ������� adium �ี��ะ��� ���ร�ี�ี�����ุ�������สำหรั��ารส���า�อ� adium"
+
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for incoming messages"
 msgstr "�ล���สีย��มื�อมี��อ�วาม���า"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound for new conversations"
 msgstr "�ล���สีย��มื�อมี�ารส���า�หม�"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound for outgoing messages"
 msgstr "�ล���สีย��มื�อส����อ�วามออ�"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when a contact logs in"
 msgstr "�ล���สีย��มื�อมี�ู��ิ���อ���าสู�ระ��"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when a contact logs out"
 msgstr "�ล���สีย��มื�อมี�ู��ิ���อออ��า�ระ��"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:36
 msgid "Play a sound when we log in"
 msgstr "�ล���สีย��มื�อ�รา���าสู�ระ��"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:37
 msgid "Play a sound when we log out"
 msgstr "�ล���สีย��มื�อ�ราออ��า�ระ��"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:38
 msgid "Popup notifications if the chat isn't focused"
 msgstr "�ุ���อ�วาม�����ห�ุ��าห��า��า�ส���า�ม�������ัส"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:39
+msgid "Popup notifications when a contact sign in"
+msgstr "�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อ���าสู�ระ��"
+
+#: ../data/empathy.schemas.in.h:40
+msgid "Popup notifications when a contact sign out"
+msgstr "�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��า�ระ��"
+
+#: ../data/empathy.schemas.in.h:41
 msgid "Salut account is created"
 msgstr "สร�า��ั��ี Salut �ล�ว"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:42
 msgid "Show avatars"
 msgstr "�ส��รู�����ัว"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:43
+msgid "Show contact list in rooms"
+msgstr "�ส��ราย�ื�อ�ู��ิ���อ��ห�อ���า��"
+
+#: ../data/empathy.schemas.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "�ส���ำ��ะ�ำวิ�ี�ิ�ห��า��า�หลั�"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:45
 msgid "Show offline contacts"
 msgstr "�ส���ู��ิ���อ�ี�ออ��ล��"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:46
 msgid "Spell checking languages"
 msgstr "ภาษา�ี��รว��ัวสะ��"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:47
 msgid "The default folder to save file transfers in."
 msgstr "��ล��อร��ริยาย�ี��ะ�ั��ึ����ม�ี���าย�อ����ามา"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:48
 msgid "The last directory that an avatar image was chosen from."
 msgstr "���ร��อรีล�าสุ��ี��ู�����ลือ�รู�����ัว"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:49
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "�ุ��������ี��ะ����ส���ารส���า��ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:50
 msgid "Use graphical smileys"
 msgstr "���รู�สีห��า����รา�ิ�ส�"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:51
 msgid "Use notification sounds"
 msgstr "����สีย������ห�ุ"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:52
 msgid "Use theme for chat rooms"
 msgstr "����ุ��������ั�ห�อ�ส���า"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:53
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "�ำห��ว�า�ะ��ิ������รื�อ�มือ�ั��า�อ� WebKit ���� ��รื�อ�มือ���าสั�����ว�� หรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:54
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "�ำห��ว�า Empathy สามาร��ระ�าศ�ำ�ห����ี��ั���อ��ู������อ�ู��ิ���อหรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "�ำห��ว�า Empathy สามาร���� GPS ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "�ำห��ว�า Empathy สามาร������รือ��าย��รศั���มือ�ือ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:57
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "�ำห��ว�า Empathy สามาร������รือ��าย���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "�ำห��ว�า Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี�า���ร��รมอื�����ล�วหรือยั�"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "�ำห��ว�า�ะ�ห� Empathy ���าระ�����ั��ี�อ��ุ���ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:60
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "�ำห��ว�า Empathy �วรล��วามละ�อีย��อ��ำ�ห����ี��ั����ื�อ�วาม����ส�ว��ัวหรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "�ำห��ว�า�ะ�ห� Empathy ���รู�����ัว�อ��ู��ิ���อ�����อ�อ��อ�ห��า��า�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:62
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "�ำห��ว�า���สร�า��ั��ี Salut ���ล�วหรือยั� �มื�อ�รีย� Empathy �รั���ร�"
+"Whether or not connectivity managers should be used to automatically "
+"disconnect/reconnect."
+msgstr ""
+"�ำห��ว�า�ะ�����ร��รม�ั��าร�าร��ื�อม��อ���าร�ั��าร��ื�อม��อ/��ื�อม��อ�หม���ยอั���มั�ิหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:63
 msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr "�ำห��ว�า�ะ�����ร��รม�ั��าร��รือ��าย���าร�ั��าร��ื�อม��อ/��ื�อม��อ�หม���ยอั���มั�ิหรือ�ม�"
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "�ำห��ว�า���สร�า��ั��ี Salut ���ล�วหรือยั� �มื�อ�รีย� Empathy �รั���ร�"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "�ำห��ว�า�ะ�รว��ัวสะ���อ��ำ�ี���อ��ามภาษา�ี��ุ���อ��าร�ะ�รว�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "�ำห��ว�า�ะ��ล���อ�วามรู�สีห��า (smiley) ����ภา��รา�ิ�ส�หรือ�ม���ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:66
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อ���าสู�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:67
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อออ��า�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for events."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ห�ุ��ี�ยว�ั��ห�ุ�าร����า�� หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ������อ�วาม���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส���า�หม�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส����อ�วามออ�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อ���าสู�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อออ��า�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ล���สีย��มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:76
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
 "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุหรือ�ม��มื�อ���รั���อ�วาม�หม� �ม�ห��า��า�ส���า�ะ��ิ�อยู� ����ม�������ัส"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:78
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อ���รั���อ�วาม�หม�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:79
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "�ำห��ว�า�ะ�ส��รู�����ัว�อ��ู��ิ���อ��ราย�ื�อ�ู��ิ���อ�ละ��ห��า��า�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "�ำห��ว�า�ะ�ส���ู��ิ���อ�ี�ออ��ล����ราย�ื�อ�ู��ิ���อ��วยหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ุ���อ�วาม�����ห�ุ�มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:82
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ��ห�อ�ส���า��า�� หรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:83
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr "�ำห��ว�า�ะ�ส���ล�อ���อ�วาม��ี�ยว�ั�วิ�ี�ิ�ห��า��า�หลั���วย�ุ�ม 'x' �����หัวห��า��า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:84
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ����ระ�ั�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:85
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "�ำห��ว�า�ะ����ุ��������ั�ห�อ�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:86
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -310,548 +414,896 @@ msgstr ""
 "��อ�ำห���าร�รีย�ลำ�ั�ราย�ื�อ�ู��ิ���อ ��า�ริยาย�ือ�รีย�ลำ�ั��าม�ื�อ�ู��ิ���อ ��ย�����า \"name\" "
 "��า�ะ�รีย��ามส�า�ะ�อ��ู��ิ���อ����� \"state\""
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:271
+#: ../libempathy/empathy-account.c:1158
+msgid "Can't set an empty display name"
+msgstr "�ม�สามาร��ำห���ื�อ�ส���ล�����ื�อว�า���ล�า���"
+
+#: ../libempathy/empathy-ft-handler.c:839
+msgid "The hash of the received file and the sent one do not match"
+msgstr "��า�ฮ��อ����ม�ี�รั��ั��อ����ม�ี�ส���ม��ร��ั�"
+
+#: ../libempathy/empathy-ft-handler.c:1099
+msgid "File transfer not supported by remote contact"
+msgstr "�ู��ิ���ออี��ั��ห�ึ���ม�รอ�รั��าร��าย�อ����ม"
+
+#: ../libempathy/empathy-ft-handler.c:1157
+msgid "The selected file is not a regular file"
+msgstr "���ม�ี��ลือ��ม�������ม���ิ"
+
+#: ../libempathy/empathy-ft-handler.c:1166
+msgid "The selected file is empty"
+msgstr "���ม�ี��ลือ�ว�า���ล�า"
+
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
 msgid "People nearby"
 msgstr "�ู�����ว�ี�"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:280
+msgid "Socket type not supported"
+msgstr "�ม�รอ�รั���อ�������ิ��ี�"
+
+#: ../libempathy/empathy-tp-file.c:399
+msgid "No reason was specified"
+msgstr "�ม�มี�ารระ�ุสา�ห�ุ"
+
+#: ../libempathy/empathy-tp-file.c:402
+msgid "The change in state was requested"
+msgstr "มี�ารร�อ��อ�าร��ลี�ย�ส�า�ะ"
+
+#: ../libempathy/empathy-tp-file.c:405
+msgid "You canceled the file transfer"
+msgstr "�ุ����ย��ลิ��าร��าย�อ����ม"
+
+#: ../libempathy/empathy-tp-file.c:408
+msgid "The other participant canceled the file transfer"
+msgstr "อี���ายห�ึ�����ย��ลิ��าร��าย�อ����ม"
+
+#: ../libempathy/empathy-tp-file.c:411
+msgid "Error while trying to transfer the file"
+msgstr "��ิ���อ�ิ��ลา���ะ�ยายาม��าย�อ����ม"
+
+#: ../libempathy/empathy-tp-file.c:414
+msgid "The other participant is unable to transfer the file"
+msgstr "อี���ายห�ึ���ม�สามาร���าย�อ����ม���"
+
+#: ../libempathy/empathy-tp-file.c:417
+msgid "Unknown reason"
+msgstr "�ม��รา�สา�ห�ุ"
+
+#: ../libempathy/empathy-utils.c:235
 msgid "Available"
 msgstr "อยู�"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:237
 msgid "Busy"
 msgstr "�ม�ว�า�"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:240
 msgid "Away"
 msgstr "�ม�อยู�"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:242
 msgid "Hidden"
 msgstr "��อ��ัว"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:244
 msgid "Offline"
 msgstr "ออ��ล��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "�ู�����ว�ี�"
+
+#: ../libempathy/empathy-utils.c:385
+msgid "Yahoo! Japan"
+msgstr "Yahoo! �ี��ุ��"
+
+#: ../libempathy/empathy-utils.c:386
+msgid "Facebook Chat"
+msgstr "�ารส���า Facebook"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d วิ�า�ี��อ�"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d �า�ี��อ�"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d �ั�ว�ม���อ�"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d วั���อ�"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d สั��าห���อ�"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d ��ือ���อ�"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "��อ�า��"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:424
 msgid "All"
 msgstr "�ั��หม�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:433
+#: ../libempathy-gtk/empathy-account-widget.c:489
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>�ั��สู�</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "�ิ��รหัส��า��ละล�า���อ���อ�"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget.c:1252
+msgid "L_og in"
+msgstr "�_��าระ��"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1302
+msgid "Enabled"
+msgstr "��ิ����"
+
+#.  Translators: this is used only when built on a moblin platform 
+#: ../libempathy-gtk/empathy-account-widget.c:1308
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "�ั��ี:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
+msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> MyScreenName</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Advanced"
+msgstr "�ั��สู�"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "_รหัส��า�:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 msgid "Screen _Name:"
 msgstr "_�ื�อ�รีย�:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "รหัส��า� AIM �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "�ื�อ�รีย��� AIM �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "_�อร��:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "��ิร���_วอร�:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> username</span>"
+msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> username</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr "ห_มาย�ล��ั��ี:"
+msgstr "_�ื�อ���าระ��:"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "�ื�อ�ู���� GroupWise �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "รหัส��า� GroupWise �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
+msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> 123456789</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
 msgstr "_UIN �อ� ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "UIN �อ� ICQ �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "รหัส��า� ICQ �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Charset:"
 msgstr "รหัส_อั��ระ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
 msgid "New Network"
 msgstr "��รือ��าย�หม�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>��รือ��าย</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>��ิร���วอร�</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "รหัสอั��ระ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "สร�า���รือ��าย IRC �หม�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "�������รือ��าย IRC �ี��ลือ�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "��รือ��าย"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "��รือ��าย:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "�ื�อ�รีย�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "รหัส��า�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "��อ�วาม��ะออ�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "�ื�อ�ริ�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "ล���รือ��าย IRC �ี��ลือ�"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "��ิร���วอร�"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user gmail com</span>"
+msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> user gmail com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
+msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> user jabber org</span>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>�ำห����า�ั���า�อ���ิร���วอร�</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "Override server settings"
+msgstr "�ำห����า�ั���า�อ���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
 msgstr "ลำ�ั��วาม_สำ�ั�:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
 msgstr "�ห_ล����อมูล:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Use old SS_L"
 msgstr "��� SSL ����_��า"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google ID?"
+msgstr "�ื�อ�ู���� Google �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your Google password?"
+msgstr "รหัส��า� Google �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your Jabber ID?"
+msgstr "�ื�อ�ู���� Jabber �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Jabber password?"
+msgstr "รหัส��า� Jabber �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your desired Jabber ID?"
+msgstr "�ุ���อ��าร����ื�ออะ�รสำหรั� Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "What is your desired Jabber password?"
+msgstr "�ุ���อ��าร���รหัส��า�อะ�รสำหรั� Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "_Encryption required (TLS/SSL)"
 msgstr "��อ����ารหัส_ลั� (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "_Ignore SSL certificate errors"
 msgstr "�_ม�ส�����อ�ิ��ลา��อ���รั�รอ� SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
+msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> user hotmail com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr "รหัส��า� Windows Live �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr "�ื�อ�ู���� Windows Live �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "_Email:"
 msgstr "_อี�มล:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_�ื�อ:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_Jabber ID:"
 msgstr "�ั��ี _Jabber:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Last Name:"
 msgstr "_�ามส�ุล:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Nickname:"
 msgstr "�ื�อ�_รีย�:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "�ื�อ�ี�_�ระ�าศ:"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
+msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> user my sip server</span>"
+
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover STUN"
 msgstr "���หา STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN Server:"
 msgstr "��ิร���วอร� STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "STUN port:"
 msgstr "�อร�� STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr "รหัส��า��ั��ี SIP �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr "�ื�อ�ั��ี SIP �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "_Username:"
 msgstr "_�ื�อ�ู����:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Use _Yahoo Japan"
 msgstr "��� Yahoo �ี��ุ�_�"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "�ื�อ�ั��ี Yahoo! �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr "รหัส��า� Yahoo! �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Yahoo I_D:"
 msgstr "_�ั��ี Yahoo:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "_Ignore conference and chatroom invitations"
 msgstr "�_ม�ส����าร��ิ����าห�อ��ระ�ุม�ละห�อ�ส���า"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "�ล��ล�อ�ราย�ื�อ_ห�อ�:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "�ม�สามาร���ล�รู�ภา����"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "ระ���อ��ุ��ม�รอ�รั��อร��ม�รู�ภา���� �ี���ร��รมยอมรั��ลย"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "�ลือ�รู�����ัว�อ��ุ�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "�ม�มีรู�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "รู�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "�ุ����ม"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "�ลิ���ื�อ�ยาย"
 
-#. This is an unknown command, display a message to the user
-#: ../libempathy-gtk/empathy-chat.c:378
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "��ื�อม��อ�ารส���า�ี���ำ�ม�สำ�ร��"
+
+#: ../libempathy-gtk/empathy-chat.c:403
 msgid "Unsupported command"
 msgstr "�ม�รอ�รั��ำสั���ี�"
 
-#: ../libempathy-gtk/empathy-chat.c:506
+#: ../libempathy-gtk/empathy-chat.c:535
 msgid "offline"
 msgstr "ออ��ล��"
 
-#: ../libempathy-gtk/empathy-chat.c:509
+#: ../libempathy-gtk/empathy-chat.c:538
 msgid "invalid contact"
 msgstr "��อมูล�ู��ิ���อ�ิ��ลา�"
 
-#: ../libempathy-gtk/empathy-chat.c:512
+#: ../libempathy-gtk/empathy-chat.c:541
 msgid "permission denied"
 msgstr "�ม����รั�อ�ุ�า�"
 
-#: ../libempathy-gtk/empathy-chat.c:515
+#: ../libempathy-gtk/empathy-chat.c:544
 msgid "too long message"
 msgstr "��อ�วามยาว��ิ���"
 
-#: ../libempathy-gtk/empathy-chat.c:518
+#: ../libempathy-gtk/empathy-chat.c:547
 msgid "not implemented"
 msgstr "ยั��ม��ำ"
 
-#: ../libempathy-gtk/empathy-chat.c:521
+#: ../libempathy-gtk/empathy-chat.c:550
 msgid "unknown"
 msgstr "�ม��รา�"
 
-#: ../libempathy-gtk/empathy-chat.c:525
+#: ../libempathy-gtk/empathy-chat.c:554
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะส����อ�วาม '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:555
+#: ../libempathy-gtk/empathy-chat.c:584
 #, c-format
 msgid "Topic set to: %s"
 msgstr "หัว��อ�ู��ั������: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:557
+#: ../libempathy-gtk/empathy-chat.c:586
 msgid "No topic defined"
 msgstr "�ม�มี�าร�ำห��หัว��อ"
 
-#: ../libempathy-gtk/empathy-chat.c:972
+#: ../libempathy-gtk/empathy-chat.c:956
+msgid "(No Suggestions)"
+msgstr "(�ม�มี�ำ��ะ�ำ)"
+
+#: ../libempathy-gtk/empathy-chat.c:1010
 msgid "Insert Smiley"
 msgstr "��ร�รู�สีห��า"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:990
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1492
 msgid "_Send"
 msgstr "_ส��"
 
-#: ../libempathy-gtk/empathy-chat.c:1024
-msgid "_Check Word Spelling..."
-msgstr "_�รว��ัวสะ���ำ..."
+#: ../libempathy-gtk/empathy-chat.c:1062
+msgid "_Spelling Suggestions"
+msgstr "�_�ะ�ำ�ัวสะ��"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1177
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s ���ามา��ห�อ�"
+msgid "%s has disconnected"
+msgstr "%s �ั��าร��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1184
+#, c-format
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s �ู� %2$s ��ะออ�"
+
+#: ../libempathy-gtk/empathy-chat.c:1187
+#, c-format
+msgid "%s was kicked"
+msgstr "%s �ู���ะออ�"
+
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1195
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s �ู� %2$s ห�าม�ม��ห����า"
+
+#: ../libempathy-gtk/empathy-chat.c:1198
+#, c-format
+msgid "%s was banned"
+msgstr "%s �ู�ห�าม�ม��ห����า"
+
+#: ../libempathy-gtk/empathy-chat.c:1202
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ออ��า�ห�อ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1260 ../src/empathy-call-window.c:764
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1211
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1234
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s ���ามา��ห�อ�"
+
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1295
 msgid "Disconnected"
 msgstr "�ั��าร��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:1657
+#: ../libempathy-gtk/empathy-chat.c:1803
 msgid "Connected"
 msgstr "��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:1707
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1853
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "�ารส���า"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>หัว��อ:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "�ารส���า�ลุ�ม"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477
+msgid "Topic:"
+msgstr "หัว��อ:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:276
 msgid "_Copy Link Address"
 msgstr "_�ั�ลอ��ี�อยู�ลิ���"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:339
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:284
 msgid "_Open Link"
 msgstr "_��ิ�ลิ���"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:432
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Ey"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "��อมูลส�ว��ุ��ล"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
 msgid "Edit Contact Information"
 msgstr "�������อมูล�ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "��อมูล�ู��ิ���อ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "�ั���อ��าร��ิ�ม�ุ���ราย�ื�อ�ู��ิ���อ"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+msgid "Personal Information"
+msgstr "��อมูลส�ว��ุ��ล"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
 msgid "New Contact"
 msgstr "�ู��ิ���อ�หม�"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "�ั�สิ���ภายห_ลั�"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "�อสมั�ร"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1255
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ยื�ยั��ี��ะล��ลุ�ม '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1257
+#: ../libempathy-gtk/empathy-contact-list-view.c:1416
 msgid "Removing group"
 msgstr "�ำลั��ะล��ลุ�ม"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1304
-#: ../libempathy-gtk/empathy-contact-list-view.c:1383
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1463
+#: ../libempathy-gtk/empathy-contact-list-view.c:1540
 msgid "_Remove"
 msgstr "_ล�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1334
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ยื�ยั��ี��ะล��ู��ิ���อ '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1495
 msgid "Removing contact"
 msgstr "�ำลั��ะล��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1341
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "�ออภัย �ั��ม���อ��าร�ห��ุ�อยู���ราย�ื�อ�ู��ิ���อ�อ��ั�อี���อ��"
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "�_�ิ�ม�ู��ิ���อ..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_ส���า"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "�_รีย�สาย"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "�รีย�สาย�ุย��วย�_สีย�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "�รีย�สาย�ุย��วย_ภา��ละ�สีย�"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "�ู�ารส���า��อ�ห_��า�ี�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "ส�����ม"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "��ิ��ื�����ะ�ห����ร�วม"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "_��อมูล"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "�_����"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "��ิ����ามาห�อ��ี�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "�_�ิ����าห�อ�ส���า"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "�ลือ��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:361
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "�ั��ึ�รู�����ัว"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:417
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "�ม�สามาร��ั��ึ�รู�����ัว"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:912
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "�ลือ�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1019
 msgid "Group"
 msgstr "�ลุ�ม"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>��อมูล��ร��รมลู���าย</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr "รหัส ISO �อ��ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>รายละ�อีย��ู��ิ���อ</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
+msgstr "�ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>�ู��ิ���อ</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "State:"
+msgstr "รั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>�ลุ�ม</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "City:"
+msgstr "�มือ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
-msgid "Account:"
-msgstr "�ั��ี:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Area:"
+msgstr "���:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr "รหัส��รษ�ีย�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Street:"
+msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr "อา�าร:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Floor:"
+msgstr "�ั��:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
+msgstr "ห�อ�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Text:"
+msgstr "��อ�วาม:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Description:"
+msgstr "�ำ�รรยาย:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr "ระ�ั��วามละ�อีย�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr "�วาม�ลา���ลื�อ�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr "�วาม�ลา���ลื�อ���ว�ั�� (�ม�ร):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr "�วาม�ลา���ลื�อ���ว�อ� (�ม�ร):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr "อั�รา�ร�ว:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Bearing:"
+msgstr "�ิศ�า�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr "อั�รา�ร�ว���ระ�ั�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr "�รั���อมูลล�าสุ��มื�อ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr "ลอ��ิ�ู�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr "ละ�ิ�ู�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr "ระ�ั��วามสู�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+msgid "<b>Location</b>"
+msgstr "<b>�ำ�ห����ี��ั��</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+msgid "<b>Location</b>, "
+msgstr "<b>�ำ�ห����ี��ั��</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr "%e %B %Ey �วลา %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>�ำ�ห����ี��ั��</b> �มื�อ (วั�-�วลา)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "�าม���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "วั���ิ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "��อมูล��ร��รมลู���าย"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "��ร��รมลู���าย:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "��อมูล�ู��ิ���อ"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1002
+msgid "Contact"
+msgstr "�ู��ิ���อ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "รายละ�อีย��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "อี�มล:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "�ื�อ���ม:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "�ลุ�ม"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "�ื�อ�ระ�ำ�ัว:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "ร�อ��อ��อมูล���ล�ว..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -859,179 +1311,196 @@ msgstr ""
 "�ลือ��ลุ�ม�ี���อ��าร�ั��ห��ู��ิ���อ�ี�อยู� สั����ว�า�ุ�สามาร��ลือ����มา��ว�าห�ึ���ลุ�ม "
 "หรือ�ะ�ม��ลือ��ลุ�ม�ลย�����"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "รุ��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "�ว������:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "�_�ิ�ม�ลุ�ม"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
 msgid "new server"
 msgstr "��ิร���วอร��หม�"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
 msgid "Server"
 msgstr "��ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
 msgid "Port"
 msgstr "�อร��"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:282
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-widget.c:302
 msgid "Account"
 msgstr "�ั��ี"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "วั��ี�"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "�ารส���า"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "�ารส���า��อ�ห��า�ี�"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "���หา"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_�ำว�า:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "�_รีย�สาย"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_ส���า"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "�ื�อ�ระ�ำ�ัว�ู��ิ���อ:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "�ารส���า�หม�"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. COL_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
+msgid "Custom Message..."
 msgstr "��อ�วาม�ำห���อ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "��อ�วาม�ำห���อ�"
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
+msgid "Edit Custom Messages..."
+msgstr "�������อ�วาม�ำห���อ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "��อ�วาม:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
+msgid "Click to remove this status as a favorite"
+msgstr "�ลิ���ื�อล�ส�า�ะ�ี�ออ��า�ส�า�ะ��ร�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "�ั��ึ���อ�วาม�����ว�"
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
+msgid "Click to make this status a favorite"
+msgstr "�ลิ���ื�อ�ำ�ห�ส�า�ะ�ี�����ส�า�ะ��ร�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "ส�า�ะ:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
+msgid "Set status"
+msgstr "�ำห��ส�า�ะ"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "�ำ"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "�ัวสะ���ี���ะ�ำสำหรั��ำ"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "��รื�อ�มือ�รว��ัวสะ��"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "�ัวสะ���ี���ะ�ำสำหรั��ำ:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "�����ั�"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "�รีย��"
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
+msgid "Set your presence and current status"
+msgstr "�ำห��ส�า�ะอยู�/�ม�อยู��อ��ุ� �ละส�า�ะ�ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "สะอา�"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "��ำ��ิ�"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1406
-msgid "Unable to open URI"
-msgstr "�ม�สามาร���ิ� URI"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1551
-msgid "Select a file"
-msgstr "�ลือ����ม"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+msgid "Custom messages..."
+msgstr "��อ�วาม�ำห���อ�..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1587
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "���รั���อ�วาม�ั���"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1589
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "ส����อ�วาม�ั���"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1591
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "�าร�อส���า��วย"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1593
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "��ื�อม��อ�ั��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1595
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "�ั��าร��ื�อม��อ�ั��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1597
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "��ื�อม��อ�ั���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1599
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "�ั��าร��ื�อม��อ�ั���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1601
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "�าร�รีย����า��ื�อส���า��วย�สีย�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1603
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "�าร�รีย�สายออ���ื�อส���า��วย�สีย�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1605
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "���ารส���า��วย�สีย�"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "��อ���อ�วาม�ำห���อ�"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "�������อ�วาม�ำห���อ�"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "�_�ิ�ม��อ�วาม�ำห��ล�ว�ห��าอั��หม�"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "��อ�วาม�ำห��ล�ว�ห��า�ี��ั��ึ��ว�"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "�����ั�"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "�รีย��"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "สะอา�"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "��ำ��ิ�"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1394
+msgid "Unable to open URI"
+msgstr "�ม�สามาร���ิ� URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
+msgid "Select a file"
+msgstr "�ลือ����ม"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1544
+msgid "Select a destination"
+msgstr "�ลือ��ี������ลาย�า�"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "�ล��ล�ั��ุ�ั�"
@@ -1216,7 +1685,7 @@ msgid "Megaphone"
 msgstr "Megaphone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:522
 msgid "Talk!"
 msgstr "�ุย!"
 
@@ -1230,15 +1699,15 @@ msgid "_Information"
 msgstr "_��อมูล"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_�รั�����"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:166
 msgid "Please configure a contact."
 msgstr "�รุ�า�ั����า�ู��ิ���อ��วย"
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:256
 msgid "Select contact..."
 msgstr "�ลือ��ู��ิ���อ..."
 
@@ -1247,27 +1716,27 @@ msgid "Presence"
 msgstr "ส�า�ะอยู�/�ม�อยู�"
 
 #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
 msgid "Set your own presence"
 msgstr "�ั����าส�า�ะอยู�/�ม�อยู��อ��ุ�"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:742
 msgid "Don't connect on startup"
 msgstr "�ม���อ���ื�อม��อ��ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:746
 msgid "Don't show the contact list on startup"
 msgstr "�ม���อ��ส��ราย�ื�อ�ู��ิ���อ��ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:750
 msgid "Show the accounts dialog"
 msgstr "�ส���ล�อ�����อ��ั��ี"
 
-#: ../src/empathy.c:450
-msgid "- Empathy Instant Messenger"
-msgstr "- ��ร��รม��อ�วาม�ั��� Empathy"
+#: ../src/empathy.c:762
+msgid "- Empathy IM Client"
+msgstr "- ลู���าย IM Empathy"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1278,7 +1747,7 @@ msgstr ""
 "GNU General Public License �ี���ย��ร���ยมูล�ิ�ิ�อ����วร��สรี �ม�ว�า�ะ����สั��าอ�ุ�า�รุ���ี� 2 "
 "หรือรุ���ั�มา (�าม����ุ��ะ�ลือ�)"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1290,7 +1759,7 @@ msgstr ""
 "*�วาม�หมาะสมสำหรั�วั��ุ�ระส������าะ�ิ����* �รุ�าอ�า� GNU General Public License "
 "��ื�อ�ูรายละ�อีย���ิ�ม��ิม"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1300,11 +1769,11 @@ msgstr ""
 "�รุ�า�ิ���อ���ี� Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "��ร��รมลู���าย��อ�วาม�ั���สำหรั� GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "����ิ�ั�ษ� �ารุ��ุ��า�ั���\n"
@@ -1312,22 +1781,165 @@ msgstr ""
 "��ามี�วลา��ร�มา��วย�ั���ล :-)\n"
 "http://gnome-th.sf.net";
 
-#: ../src/empathy-accounts-dialog.c:391
-msgid "Enabled"
-msgstr "��ิ����"
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "��ิ���อ�ิ��ลา���ะ�ำ���า�ั��ี"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
-msgid "Accounts"
-msgstr "�ั��ี"
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "��ิ���อ�ิ��ลา���ะ���รายละ�อีย��ั��ี"
+
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "��ิ���อ�ิ��ลา���ะสร�า��ั��ี"
+
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "��ิ���อ�ิ��ลา�"
+
+#: ../src/empathy-account-assistant.c:141
+#, c-format
+msgid "The error message was: <span style=\"italic\">%s</span>"
+msgstr "��อ�ิ��ลา��ือ: <span style=\"italic\">%s</span>"
 
+#: ../src/empathy-account-assistant.c:149
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"�ุ�สามาร��ลั�����อ�รายละ�อีย��อ��ั��ี�อ��ุ��หม� หรือ�ะออ��า���รื�อ�มือ��วย�ี� "
+"�ล�ว��ิ�ม�ั��ี��ภายหลั��า��ม�ู \"�����\" �����"
+
+#: ../src/empathy-account-assistant.c:184
+msgid "An error occurred"
+msgstr "��ิ���อ�ิ��ลา�"
+
+#. Create account
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:321
+#: ../src/empathy-accounts-dialog.c:1430
 #, c-format
 msgid "New %s account"
 msgstr "�ั��ี %s �หม�"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-account-assistant.c:393
+msgid "What kind of chat account do you have?"
+msgstr "�ุ�มี�ั��ีส���า��ิ��ห�?"
+
+#: ../src/empathy-account-assistant.c:399
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "�ุ�มี�ั��ีส���าอื���ี���อ��าร�ั����าอี�หรือ�ม�?"
+
+#: ../src/empathy-account-assistant.c:405
+msgid "Enter your account details"
+msgstr "��อ�รายละ�อีย��อ��ั��ี�อ��ุ�"
+
+#: ../src/empathy-account-assistant.c:410
+msgid "What kind of chat account do you want to create?"
+msgstr "�ุ���อ��ารสร�า��ั��ีส���า��ิ��ห�?"
+
+#: ../src/empathy-account-assistant.c:416
+msgid "Do you want to create other chat accounts?"
+msgstr "�ุ���อ��าร��ิ�ม�ั��ีส���าอื��อี�หรือ�ม�?"
+
+#: ../src/empathy-account-assistant.c:423
+msgid "Enter the details for the new account"
+msgstr "��อ�รายละ�อีย��อ��ั��ี�หม��ี��ะสร�า�"
+
+#: ../src/empathy-account-assistant.c:509
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"�ุ�สามาร���� Empathy ส���า�ั��ู����ี�ออ��ล����ล�� �ละ�ั���ื�อ�� �ละ��ื�อ�ร�วม�า��ี���� Google "
+"Talk, AIM, Windows Live �ละ��ร��รมส���าอื��� อี�มา�มาย �ละ��า����ม��ร���หรือ�ว����ม "
+"�ุ���ยั�สามาร��ู��ุย��วย�สีย�หรือภา������วย"
+
+#: ../src/empathy-account-assistant.c:526
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "�ุ�มี�ั��ี�ี�����ั���ร��รมส���าอื��อยู�หรือ�ม�?"
+
+#: ../src/empathy-account-assistant.c:549
+msgid "Yes, import my account details from "
+msgstr "มี ��วย�ำ���า��อมูล�ั��ี�อ���า����า�า� "
+
+#: ../src/empathy-account-assistant.c:570
+msgid "Yes, I'll enter my account details now"
+msgstr "มี ��า����า�ะ��อ���อมูล�ั��ี�อ���า����า��ี�ยว�ี�"
+
+#: ../src/empathy-account-assistant.c:592
+msgid "No, I want a new account"
+msgstr "�ม�มี ��า����า��อ��ารสร�า��ั��ี�หม�"
+
+#: ../src/empathy-account-assistant.c:602
+msgid "No, I just want to see people online nearby for now"
+msgstr "�ม�มี ��า����า�����อ��าร�ู�ู����ี�ออ��ล��อยู���ล�� ����ั�����อ��ี�"
+
+#: ../src/empathy-account-assistant.c:623
+msgid "Select the accounts you want to import:"
+msgstr "�ลือ��ั��ี�ี��ุ���อ��าร�ำ���า:"
+
+#: ../src/empathy-account-assistant.c:710
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "���"
+
+#: ../src/empathy-account-assistant.c:717
+msgid "No, that's all for now"
+msgstr "�ม� �อ����ั����อ�"
+
+#: ../src/empathy-account-assistant.c:910
+msgid "Welcome to Empathy"
+msgstr "ยิ��ี��อ�รั�สู� Empathy"
+
+#: ../src/empathy-account-assistant.c:919
+msgid "Import your existing accounts"
+msgstr "�ำ���า�ั��ี�อ��ุ��ี�มี"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:63
+#, c-format
+msgid "There are unsaved modification regarding your %s account."
+msgstr "มี��อมูล��ี�ยว�ั��ั��ี %s �อ��ุ��ี�ยั��ม�����ั��ึ�"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../src/empathy-accounts-dialog.c:236
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s �ี� %2$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:248
+#, c-format
+msgid "%s Account"
+msgstr "�ั��ี %s"
+
+#: ../src/empathy-accounts-dialog.c:252
+msgid "New account"
+msgstr "�ั��ี�หม�"
+
+#: ../src/empathy-accounts-dialog.c:516
+msgid ""
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"�ุ��ำลั��ะสร�า��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
+"ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
+
+#: ../src/empathy-accounts-dialog.c:802
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1336,7 +1948,13 @@ msgstr ""
 "�ุ��ำลั��ะล��ั��ี %s �อ��ุ�!\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#. Translators: this is used only when built on a moblin platform
+#: ../src/empathy-accounts-dialog.c:806
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "�ุ���อ��ารล� %s ออ��า���รื�อ��อ��ุ�หรือ�ม�?"
+
+#: ../src/empathy-accounts-dialog.c:812
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1348,302 +1966,309 @@ msgstr ""
 "\n"
 "��า�ุ���ิ�ม�ั��ี�ี��ลั����ามา��ภายหลั� ��อมูล�ั��ล�าว��ยั����ำ�ลั�มา������"
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>�ั��ี�หม�</b>"
+#. Translators: this is used only when built on a moblin platform
+#: ../src/empathy-accounts-dialog.c:819
+msgid "This will not remove your account on the server."
+msgstr "�ารล��ี��ะ�ม�ล��ั��ี�อ��ุ��ี���ิร���วอร�"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>�ม�มี��ร���อล�ิ��ั��อยู�</b>"
+#: ../src/empathy-accounts-dialog.c:1010
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"�ุ��ำลั��ะ�ลือ��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
+"ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>��า�ั��</b>"
+#: ../src/empathy-accounts-dialog.c:1507
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"�ุ��ำลั��ะ�ิ�ห��า��า� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
+"ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
+
+#.  Translators: this is used only when built on a moblin platform 
+#: ../src/empathy-accounts-dialog.c:1673
+msgid "_Next"
+msgstr "_�ั���"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "�ั��ี"
+
+# This is part of "Add new <type> account" message
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add new"
+msgstr "สร�า��ั��ี"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "_สร�า�"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "��า����ามี�ั��ี�ี��ะ����า�อยู��ล�ว"
-
-#: ../src/empathy-accounts-dialog.glade.h:7
-msgid "Import Accounts..."
-msgstr "�ำ���า�ั��ี..."
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "No protocol installed"
+msgstr "�ม�มี��ร���อล�ิ��ั��อยู�"
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "��อ��ี��ะ��ิ�ม�ั��ี�หม� �ุ���อ��ิ��ั�������อ���สำหรั���ร���อล�ี���อ��าร�ะ����สีย��อ�"
 
-#: ../src/empathy-accounts-dialog.glade.h:9
-msgid "Type:"
-msgstr "��ิ�:"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "_Add..."
+msgstr "�_�ิ�ม..."
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "_Create a new account"
+msgstr "_สร�า��ั��ี�หม�"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
+msgid "_Reuse an existing account"
+msgstr "�ำ�ั��ี�ี�มีอยู��ลั�มา�_���หม�"
 
-#: ../src/empathy-call-window.c:346
+# This is part of "Add new <type> account" message
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "account"
+msgstr "�หม�"
+
+#: ../src/empathy-call-window.c:427
 msgid "Contrast"
 msgstr "�วาม��า�ระ�ั�สี"
 
-#: ../src/empathy-call-window.c:349
+#: ../src/empathy-call-window.c:430
 msgid "Brightness"
 msgstr "�วามสว�า�"
 
-#: ../src/empathy-call-window.c:352
+#: ../src/empathy-call-window.c:433
 msgid "Gamma"
 msgstr "��มมา"
 
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:541
 msgid "Volume"
 msgstr "�วาม�ั�"
 
-#: ../src/empathy-call-window.c:547
+#: ../src/empathy-call-window.c:674
+msgid "Connecting..."
+msgstr "�ำลั���ื�อม��อ..."
+
+#: ../src/empathy-call-window.c:781
 msgid "_Sidebar"
 msgstr "���_��า�"
 
-#: ../src/empathy-call-window.c:565
+#: ../src/empathy-call-window.c:800
 msgid "Dialpad"
 msgstr "������รศั���"
 
-#: ../src/empathy-call-window.c:571
+#: ../src/empathy-call-window.c:806
 msgid "Audio input"
 msgstr "�สีย����า"
 
-#: ../src/empathy-call-window.c:575
+#: ../src/empathy-call-window.c:810
 msgid "Video input"
 msgstr "ภา����า"
 
-#: ../src/empathy-call-window.c:588
-msgid "Connecting..."
-msgstr "�ำลั���ื�อม��อ..."
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:873
+#, c-format
+msgid "Call with %s"
+msgstr "�าร�ุยสาย�ั� %s"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:954
+msgid "Call"
+msgstr "�าร�ุยสาย"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:844
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "à¹?à¸?ืà¹?อมà¸?à¹?อà¹?ลà¹?ว â?? %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "วา�สาย"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "�รีย���ำ"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "ส��สั��า��สีย�"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "ส��ภา�วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "�ส���ัวอย�า�วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "�_รีย�สาย"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "มุ_มมอ�"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:349
 #, c-format
 msgid "Conversations (%d)"
 msgstr "�ารส���า (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "หัว��อ:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:481
 msgid "Typing a message."
 msgstr "�ำลั��ิม����อ�วาม"
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "��อ�วาม�หม��า� %s"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_ล�า�"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "�ารส���า"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "��ร�รู�_สีห��า"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "_��อ�วาม��ิ�:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "��ิ�"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "ย�าย�������า�_��าย"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "ย�าย�������า�_�วา"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "�ลือ��ู��ี��ุ��ะ��ิ�:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "�ุ����รั��ำ��ิ��ห����าร�วมส���า��ห�อ��ระ�ุม"
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_�ิ���อ"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "��ื�อ_หา"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "�าร_ส���า"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "_�ึ�����ออ�"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "_ห�อ�ส���า��ร�"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "_วิ�ี���"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "����_�ั���"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "����_��อ�ห��า"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "�_ส��ราย�ื�อ�ู��ิ���อ"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "�_���"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "�ื�อ"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "ห�อ�"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "��ื�อม��ออั���มั�ิ"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "�����ห�อ�ส���า��ร�"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "���าห�อ��มื�อ�_ริ�ม�ำ�า�"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "���าห�อ�ส���า�ี��มื�อ Empathy �ริ�ม�ำ�า��ละ��ื�อม��อสำ�ร��"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "�ั��ารห�อ���ร�"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_�ื�อ:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "��ิร���_วอร�"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_ห�อ�"
-
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:322
 msgid "Incoming call"
 msgstr "�าร�รีย����า"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:325
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s �ำลั��รีย�สาย�ุ�อยู� �ุ���อ��าร�ะ�อ�รั�หรือ�ม�?"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:332
 msgid "_Reject"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:338
 msgid "_Answer"
 msgstr "_�อ�รั�"
 
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:446
 #, c-format
 msgid "Incoming call from %s"
 msgstr "�าร�รีย����า�า� %s"
 
-#: ../src/empathy-event-manager.c:564
+#: ../src/empathy-event-manager.c:490
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s ส���ำ��ิ��ึ��ุ�"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:496
 msgid "An external application will be started to handle it."
 msgstr "�ะ�รีย���ร��รมภาย�อ���ื�อ�ั��าร�ำ��ิ��ี�"
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:501
 msgid "You don't have the needed external application to handle it."
 msgstr "����ุ��ม�มี��ร��รมภาย�อ��ี��ะ�ั��าร�ำ��ิ��ี�"
 
-#: ../src/empathy-event-manager.c:698
+#: ../src/empathy-event-manager.c:628
 msgid "Room invitation"
 msgstr "�ำ��ิ�สู�ห�อ�ส���า"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:631
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ��ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1032
+#: ../src/empathy-event-manager.c:639
 msgid "_Decline"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:644
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "�_��าห�อ�"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:683
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s �����ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#: ../src/empathy-event-manager.c:867
+#: ../src/empathy-event-manager.c:709
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "�าร��า��อ����ม���า�า� %s"
 
-#: ../src/empathy-event-manager.c:961
+#: ../src/empathy-event-manager.c:889
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "มี�าร�อสมั�ร�า� %s"
 
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid ""
 "\n"
@@ -1652,494 +2277,778 @@ msgstr ""
 "\n"
 "��อ�วาม: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:929
+#, c-format
+msgid "%s is now offline."
+msgstr "%s ออ��ล���ล�ว"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:945
+#, c-format
+msgid "%s is now online."
+msgstr "%s ออ��ล���ล�ว"
+
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:114
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:117
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "�ม�มี�ารระ�ุสา�ห�ุ"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr "มี�ารร�อ��อ�าร��ลี�ย�ส�า�ะ"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr "�ุ����ย��ลิ��าร��าย�อ����ม"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr "อี���ายห�ึ�����ย��ลิ��าร��าย�อ����ม"
-
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr "��ิ���อ�ิ��ลา���ะ�ยายาม��าย�อ����ม"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "�ม��รา�"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr "อี���ายห�ึ���ม�สามาร���าย�อ����ม���"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s �า� %s �ี� %s/s"
 
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "�ม��รา�สา�ห�ุ"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s �า� %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:226
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "�ำลั�รั� \"%s\" �า� %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "�ำลั�ส�� \"%s\" �ห��ั� %s"
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "�ม��รา�"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "��ิ���อ�ิ��ลา���ะรั� \"%s\" �า� %s"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "��ิ���อ�ิ��ลา���ะรั����ม"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s �า� %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "��ิ���อ�ิ��ลา���ะส�� \"%s\" �ห��ั� %s"
 
-#: ../src/empathy-ft-manager.c:254
-msgid "Waiting the other participant's response"
-msgstr "�ำลั�รอ�ห�อี���ายห�ึ���อ��ลั�"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "��ิ���อ�ิ��ลา���ะส�����ม"
 
-#: ../src/empathy-ft-manager.c:264
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "รั� \"%s\" �า� %s �รีย�ร�อย"
 
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ส�� \"%s\" �ห��ั� %s �รีย�ร�อย"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "��าย�อ����ม�สร��สม�ูร��"
 
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "�ารรั� \"%s\" �า� %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "�ำลั�รอ�ห�อี���ายห�ึ���อ��ลั�"
 
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "�ารส�� \"%s\" �ห��ั� %s"
+msgid "Checking integrity of \"%s\""
+msgstr "�ำลั��รว�สอ��วาม�ร���ว��อ� \"%s\""
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "ย��ลิ��าร��าย�อ����ม: %s"
+msgid "Hashing \"%s\""
+msgstr "�ำลั��ำ�ว��ฮ��อ� \"%s\""
 
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "�ม��รา�"
-
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "�ม��รา�"
-
-#: ../src/empathy-ft-manager.c:663
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:675
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "���ม"
 
-#: ../src/empathy-ft-manager.c:697
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "�หลืออี�"
 
-#: ../src/empathy-ft-manager.c:895
-msgid "Cannot save file to this location"
-msgstr "�ม�สามาร��ั��ึ����มล��ี��ำ�ห����ี�"
-
-#: ../src/empathy-ft-manager.c:941
-msgid "Save file as..."
-msgstr "�ั��ึ����ม����..."
-
-#: ../src/empathy-ft-manager.c:1011
-msgid "unknown size"
-msgstr "�ม��รา���า�"
-
-#: ../src/empathy-ft-manager.c:1017
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s ��อ��ารส�����ม�ห��ั��ุ�"
-
-#. Translators: the first %s is the file name, the second %s is the file size
-#: ../src/empathy-ft-manager.c:1023
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "�ุ���อ��ารรั����ม \"%s\" (%s) หรือ�ม�?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1041
-msgid "_Accept"
-msgstr "_รั�"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "�าร��าย�อ����ม"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "ล�ราย�าร��าย�อ��ี��สร���ล�ว �ี��ู�ย��ลิ� หรือ�ี��ม�สำ�ร�� ออ��า�ราย�ื�อ"
 
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "�ม����ั��ี�ี��ะ�ำ���า ��ะ�ี� Empathy รอ�รั��าร�ำ���า�ั��ี�า� Pidgin ���า�ั��"
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "�ำ���า�ั��ี"
+
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:260
+#: ../src/empathy-import-widget.c:282
 msgid "Import"
 msgstr "�ำ���า"
 
-#: ../src/empathy-import-dialog.c:269
+#: ../src/empathy-import-widget.c:291
 msgid "Protocol"
 msgstr "��ร���อล"
 
-#: ../src/empathy-import-dialog.c:295
+#: ../src/empathy-import-widget.c:315
 msgid "Source"
 msgstr "�หล����อมูล"
 
-#: ../src/empathy-import-dialog.c:389
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "�ม����ั��ี�ี��ะ�ำ���า ��ะ�ี� Empathy รอ�รั��าร�ำ���า�ั��ี�า� Pidgin ���า�ั��"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "�ั��ี %s"
 
-#: ../src/empathy-import-dialog.glade.h:1
-msgid "Import Accounts"
-msgstr "�ำ���า�ั��ี"
+#: ../src/empathy-main-window.c:399
+msgid "_Edit account"
+msgstr "�_�����ั��ี"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:502
 msgid "No error specified"
 msgstr "�ม�มี�ารระ�ุสา�ห�ุ��อ�ิ��ลา�"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:505
 msgid "Network error"
 msgstr "��อ�ิ��ลา���ี�ยว�ั���รือ��าย"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:508
 msgid "Authentication failed"
 msgstr "�ารยื�ยั��ัว�ุ��ล�ม���า�"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:511
 msgid "Encryption error"
 msgstr "��อ�ิ��ลา���ี�ยว�ั��าร���ารหัสลั�"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:514
 msgid "Name in use"
 msgstr "�ื�อ�ู����อยู�"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:517
 msgid "Certificate not provided"
 msgstr "�ม�มี��รั�รอ�"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:520
 msgid "Certificate untrusted"
 msgstr "�ม���ื�อ�ือ��รั�รอ�"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:523
 msgid "Certificate expired"
 msgstr "��รั�รอ�หม�อายุ�ล�ว"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:526
 msgid "Certificate not activated"
 msgstr "��รั�รอ�ยั��ม�มี�าร�ริ�ม���"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:529
 msgid "Certificate hostname mismatch"
 msgstr "�ื�อ�ฮส������รั�รอ��ม��ร��ั�"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:532
 msgid "Certificate fingerprint mismatch"
 msgstr "ลาย�ิ�วมือ����รั�รอ��ม��ร��ั�"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:535
 msgid "Certificate self-signed"
 msgstr "��รั�รอ�����รั�รอ��ัว�อ�"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:538
 msgid "Certificate error"
 msgstr "��อ�ิ��ลา���ี�ยว�ั���รั�รอ�"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:541
 msgid "Unknown error"
 msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1288
 msgid "Show and edit accounts"
 msgstr "�ส���ละ������ั��ี��า��"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "�ิ���อ"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "�_�����ั��ี"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "ราย�ื�อ�ู��ิ���อ"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "�ส���ู��ิ���อ���_���ี�"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "�ริ��"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "���าห�อ��_�ร�"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "���าห�อ��_หม�..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "�ั��ารห�อ���ร�"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "�ส���ู��ิ���อ�ี�_ออ��ล��"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "��า�_���ิ"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "��า����ิ�ร�อมรู��_���ัว"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "�รีย��าม_�ื�อ"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "�รีย��าม_ส�า�ะ"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_�ั��ี"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "�_�ิ�ม�ู��ิ���อ..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "��า�_�ะ�ั�รั�"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_�ี�ั��"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "�าร_��าย�อ����ม"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "�_��าห�อ�..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "�ารส���า�_หม�..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "�ู��ิ���อ�ี�_ออ��ล��"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_��อมูลส�ว��ุ��ล"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "�ารส���า��อ�ห_��า�ี�"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_ห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:328
+msgid "Chat Room"
 msgstr "ห�อ�ส���า"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "�รีย��ู:"
+#: ../src/empathy-new-chatroom-dialog.c:344
+msgid "Members"
+msgstr "สมา�ิ�"
+
+#: ../src/empathy-new-chatroom-dialog.c:494
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"�ู�รั���ิ����า�ั��: %s\n"
+"��อ����รหัส��า�: %s\n"
+"สมา�ิ�: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "No"
+msgstr "�ม����"
+
+#: ../src/empathy-new-chatroom-dialog.c:524
+msgid "Could not start room listing"
+msgstr "�ม�สามาร��ริ�ม�ส��ราย�ื�อห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:534
+msgid "Could not stop room listing"
+msgstr "�ม�สามาร�หยุ��ส��ราย�ื�อห�อ�"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "�ม�สามาร�อ�า�ราย�ื�อห�อ�"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "��อ��ื�อห�อ��ี��ะ���า�ี��ี� หรือ�ลิ��ื�อห�อ��า�ราย�ื�อ�ั�����ห�ึ��ห�อ��ึ����"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr "��อ���ิร���วอร��ี������ี�อยู��อ�ห�อ� หรือ�ล�อยว�า��ว���าห�อ�อยู�����ิร���วอร��อ��ั��ี�ั��ุ�ั�"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "�_��าห�อ�"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "���าห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "���าห�อ��หม�"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "ราย�ื�อห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_�รั���อมูล"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "ราย�ื�อห�อ�ส���า�ั��หม��ี�อยู�����ิร���วอร��ี��ุ���อ�"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_ห�อ�:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "���รั���อ�วาม"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "ส����อ�วาม"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "�ารส���า�หม�"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "�ู��ิ���อ���าสู�ระ��"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "�ู��ิ���อออ��า�ระ��"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "�ั��ีมี�าร��ื�อม��อ"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "�ั��ี�ั��าร��ื�อม��อ"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "ภาษา"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>ห��า�า</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>�ฤ�ิ�รรม</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "อ�ุ�า��ห������อมูล _GPS"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>ราย�ื�อ�ู��ิ���อ</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "อ�ุ�า��ห������อมูล��รศั���_มือ�ือ"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>��ิ�����าร�รว��ัวสะ��สำหรั�ภาษา:</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "อ�ุ�า��ห������อมูล�_�รือ��าย"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>�ล���สีย�สำหรั��ห�ุ�าร����า��</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "ห��า�า"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr "<small>ราย�ื�อภาษา�ี��ะมี��ีย�ภาษา�ี��ุ�����ิ��ั�����า�ุ�รม�ว����า�ั��</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "��ื�อม_��อ��ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�"
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "รู�����ัว����รู��ี��ู�����ลือ�����ัว�อ���ราย�ื�อ�ู��ิ���อ"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "�ฤ�ิ�รรม"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "�ุ�_������ห��า��า�ส���า:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "�ิ��าร�����ห�ุ�มื�อ�_ม�อยู�หรือ�ม�ว�า�"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "�ิ��าร����สีย��มื�อ�_ม�อยู�หรือ�ม�ว�า�"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "��ิ�����าร�����ห�ุ�มื�อ�ู��ิ���อ_ออ��ล��"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "��ิ�����าร�����ห�ุ�มื�อ�ู��ิ���อออ_��ล��"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "��ิ�����าร�����ห�ุ�มื�อห��า��า�_ส���า�ม�������ัส"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "��ิ�����าร�รว��ัวสะ��สำหรั�ภาษา:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "�ั�ว��"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "��า�ั����าะ�สภูมิศาส�ร�"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "�ำ�ห����ี��ั��"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "�าร�����ห�ุ"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "�ล���สีย�สำหรั��ห�ุ�าร����า��"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "�รั�����"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "�ส��รู��_���ัว"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "�วาม����ส�ว��ัว"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"�วามละ�อีย��อ��ำ�ห����ี��ั���ี�ล�ล� �ะหมาย�ึ��าร�ม��ระ�าศ��อมูล�ี�ละ�อีย����ว�า�มือ� รั� "
+"�ละ�ระ��ศ�ี��ุ�อยู� �ิ�ั��า� GPS �ะละ�อีย��ึ��ศ�ิยมห�ึ���ำ�ห���"
+
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "�ส��รู�_สีห��า���รู�ภา�"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "�ส��ราย�ื�อ�ู��ิ���อ���_�ระ�ั�"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "�รีย��าม_�ื�อ"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "�ส��_ราย�ื�อ�ู��ิ���อ��ห�อ���า��"
 
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "�รีย��ามส_�า�ะ"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "�สีย�"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "�าร�รว��ัวสะ��"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "ราย�ื�อภาษา�ี��ะมี��ีย�ภาษา�ี��ุ�����ิ��ั�����า�ุ�รม�ว����า�ั��"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "�ุ�������"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "�_�ิ�����รอ��ำ�ู������ห�ุ"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "�_�ิ�����าร�����ห�ุ��วย�สีย�"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_��ิ��ารส���า�หม���ห��า��า��ย�"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_�ระ�าศ�ำ�ห����ี��ั����ยั��ู��ิ���อ�อ���า����า"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "_ล��วามละ�อีย��อ��ำ�ห����ี��ั��"
+
+#: ../src/empathy-status-icon.c:175
+msgid "Respond"
+msgstr "�อ�รั�"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "ส�า�ะ"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "_ออ�"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "�_ส��ราย�ื�อ�ู��ิ���อ"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:376
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "�ม�สามาร���ิ���ร��รมสำหรั��ริ�าร %s: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:447
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
 msgstr "�ุ����รั��ำ��ิ�สำหรั��ริ�าร %s ����ุ��ม�มี��ร��รม�ี��ะ�ั��าร�ำ��ิ��ี�"
 
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "����ี��ู��ิ���อ"
+
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
+msgid "Error"
+msgstr "��อ�ิ��ลา�"
+
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
+msgid "Critical"
+msgstr "วิ�ฤ�ิ"
+
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
+msgid "Warning"
+msgstr "�ำ��ือ�"
+
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
+msgid "Message"
+msgstr "��อ�วาม"
+
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
+msgid "Info"
+msgstr "��อมูล"
+
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
+msgid "Debug"
+msgstr "�ี�ั��"
+
+#: ../src/empathy-debug-window.c:841
+msgid "Save"
+msgstr "�ั��ึ�"
+
+#: ../src/empathy-debug-window.c:944
+msgid "Debug Window"
+msgstr "ห��า��า��ี�ั��"
+
+#: ../src/empathy-debug-window.c:1019
+msgid "Pause"
+msgstr "�ั�"
+
+#: ../src/empathy-debug-window.c:1031
+msgid "Level "
+msgstr "ระ�ั� "
+
+#: ../src/empathy-debug-window.c:1100
+msgid "Time"
+msgstr "�วลา"
+
+#: ../src/empathy-debug-window.c:1102
+msgid "Domain"
+msgstr "���ม�"
+
+#: ../src/empathy-debug-window.c:1104
+msgid "Category"
+msgstr "หมว�"
+
+#: ../src/empathy-debug-window.c:1106
+msgid "Level"
+msgstr "ระ�ั�"
+
+#: ../src/empathy-debug-window.c:1138
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "��รื�อ�มือ�ั��าร�าร��ื�อม��อ�ี��ลือ��ม�รอ�รั�ส�ว��ยายสำหรั��ี�ั��ระยะ��ล"
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy: ��ร��รม��อ�วาม�ั���"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "�ิ��รหัส��า��ละล�า���อ���อ�"
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>��รือ��าย</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>��ิร���วอร�</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "�������รือ��าย IRC �ี��ลือ�"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "ล���รือ��าย IRC �ี��ลือ�"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_�รว��ัวสะ���ำ..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>หัว��อ:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "�ารส���า�ลุ�ม"
+
+#~ msgid "Contact Information"
+#~ msgstr "��อมูล�ู��ิ���อ"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "�ั���อ��าร��ิ�ม�ุ���ราย�ื�อ�ู��ิ���อ"
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "�ออภัย �ั��ม���อ��าร�ห��ุ�อยู���ราย�ื�อ�ู��ิ���อ�อ��ั�อี���อ��"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>�ลุ�ม</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "��อมูล�ู��ิ���อ"
+
+#~ msgid "Word"
+#~ msgstr "�ำ"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "�ัวสะ���ี���ะ�ำสำหรั��ำ"
+
+#~ msgid "Spell Checker"
+#~ msgstr "��รื�อ�มือ�รว��ัวสะ��"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "�ัวสะ���ี���ะ�ำสำหรั��ำ:"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- ��ร��รม��อ�วาม�ั��� Empathy"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>�ั��ี�หม�</b>"
+
+#~ msgid "<b>Settings</b>"
+#~ msgstr "<b>��า�ั��</b>"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "�ำ���า�ั��ี..."
+
+#~ msgid "New message from %s"
+#~ msgstr "��อ�วาม�หม��า� %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "_��อ�วาม��ิ�:"
+
+#~ msgid "Invite"
+#~ msgstr "��ิ�"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "�ุ����รั��ำ��ิ��ห����าร�วมส���า��ห�อ��ระ�ุม"
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "�����ห�อ�ส���า��ร�"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "���าห�อ��มื�อ�_ริ�ม�ำ�า�"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "���าห�อ�ส���า�ี��มื�อ Empathy �ริ�ม�ำ�า��ละ��ื�อม��อสำ�ร��"
+
+#~ msgid "N_ame:"
+#~ msgstr "_�ื�อ:"
+
+#~ msgid "S_erver:"
+#~ msgstr "��ิร���_วอร�"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "�ม��รา�"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "�ารรั� \"%s\" �า� %s"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "�ารส�� \"%s\" �ห��ั� %s"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "ย��ลิ��าร��าย�อ����ม: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "�ม��รา�"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "�ม�สามาร��ั��ึ����มล��ี��ำ�ห����ี�"
+
+#~ msgid "Save file as..."
+#~ msgstr "�ั��ึ����ม����..."
+
+#~ msgid "unknown size"
+#~ msgstr "�ม��รา���า�"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s ��อ��ารส�����ม�ห��ั��ุ�"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "�ุ���อ��ารรั����ม \"%s\" (%s) หรือ�ม�?"
+
+#~ msgid "_Accept"
+#~ msgstr "_รั�"
+
+#~ msgid "Join _New..."
+#~ msgstr "���าห�อ��_หม�..."
+
+#~ msgid "Browse:"
+#~ msgstr "�รีย��ู:"
+
+#~ msgid "Join"
+#~ msgstr "�_��าห�อ�"
+
+#~ msgid "Join New"
+#~ msgstr "���าห�อ��หม�"
+
+#~ msgid "Re_fresh"
+#~ msgstr "_�รั���อมูล"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "ราย�ื�อห�อ�ส���า�ั��หม��ี�อยู�����ิร���วอร��ี��ุ���อ�"
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>ราย�ื�อ�ู��ิ���อ</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "รู�����ัว����รู��ี��ู�����ลือ�����ัว�อ���ราย�ื�อ�ู��ิ���อ"
+
+#~ msgid "Show _avatars"
+#~ msgstr "�ส��รู��_���ัว"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "�ส��ราย�ื�อ�ู��ิ���อ���_�ระ�ั�"
+
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "�ส����อ�วาม�ุ��ึ���มื�อ�ู��ิ���ออยู�"
 
@@ -2155,18 +3064,9 @@ msgstr "�ุ����รั��ำ��ิ�สำหรั��ริ
 #~ msgid "Closing this window will end the call in progress."
 #~ msgstr "�าร�ิ�ห��า��า��ี� �ะ���าร�รีย��ี�ยั��ำ��ิ��ารอยู�"
 
-#~ msgid "_End Call"
-#~ msgstr "_���าร�รีย�"
-
-#~ msgid "Empathy Call"
-#~ msgstr "�าร�รีย� Empathy"
-
 #~ msgid "Readying"
 #~ msgstr "�ำลั���รียม�ร�อม"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - �าร�รีย� Empathy"
-
 #~ msgid ""
 #~ "Incoming call from %s rejected because there is already a running call."
 #~ msgstr "�าร�รีย����า�า� %s �ู���ิ�ส���ราะมี�าร�ุยสาย�ำ��ิ�อยู�"