[empathy] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit 19f691a07f555c2f30989fd3951b6749fd8b8d4d
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Wed Jan 27 23:40:38 2010 +0700

    Updated Thai translation.

 po/th.po | 1042 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 555 insertions(+), 487 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index 27e0450..d3ea35d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,15 +1,15 @@
 # Thai translation of empathy
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
-# Theppitak Karoonboonyanan <thep linux thai net>, 2008-2009.
+# Theppitak Karoonboonyanan <thep linux thai net>, 2008-2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-12-23 06:05+0000\n"
-"PO-Revision-Date: 2009-12-23 17:53+0700\n"
+"POT-Creation-Date: 2010-01-25 14:14+0000\n"
+"PO-Revision-Date: 2010-01-27 23:31+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -49,8 +49,8 @@ msgstr "�ุ�������ห��า��า�ส���า"
 
 #: ../data/empathy.schemas.in.h:4
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "ราย�ื�อ�อ�ภาษา�ี��ะ�รว�สอ��ัวสะ�� (���� en, fr, nl) �ั����วย�ุลภา�"
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "ราย�ื�อ�อ�ภาษา�ี��ะ�รว�สอ��ัวสะ�� (���� \"en, fr, nl\") �ั����วย�ุลภา�"
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
@@ -149,12 +149,12 @@ msgid "Open new chats in separate windows"
 msgstr "��ิ��ารส���า�หม���ห��า��า��ย�"
 
 #: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "�า��อ��ุ������� adium �ี��ะ���"
+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"
+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"
@@ -185,15 +185,15 @@ msgid "Play a sound when we log out"
 msgstr "�ล���สีย��มื�อ�ราออ��า�ระ��"
 
 #: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+msgid "Pop up notifications if the chat isn't focused"
 msgstr "�ุ���อ�วาม�����ห�ุ��าห��า��า�ส���า�ม�������ัส"
 
 #: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+msgid "Pop up notifications when a contact logs in"
 msgstr "�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อ���าสู�ระ��"
 
 #: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+msgid "Pop up notifications when a contact logs out"
 msgstr "�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��า�ระ��"
 
 #: ../data/empathy.schemas.in.h:41
@@ -249,196 +249,182 @@ msgid "Use theme for chat rooms"
 msgstr "����ุ��������ั�ห�อ�ส���า"
 
 #: ../data/empathy.schemas.in.h:54
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "�ำห��ว�า�ะ��ิ������รื�อ�มือ�ั��า�อ� WebKit ���� ��รื�อ�มือ���าสั�����ว�� หรือ�ม�"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "�ำห��ว�า Empathy สามาร��ระ�าศ�ำ�ห����ี��ั���อ��ู������อ�ู��ิ���อหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "�ำห��ว�า Empathy สามาร��ระ�าศ�ำ�ห����ี��ั���อ��ู������อ�ู��ิ���อหรือ�ม�"
+msgid "Whether 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 GPS to guess the location."
-msgstr "�ำห��ว�า Empathy สามาร���� GPS ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
+msgid "Whether 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 cellular network to guess the location."
-msgstr "�ำห��ว�า Empathy สามาร������รือ��าย��รศั���มือ�ือ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "�ำห��ว�า Empathy สามาร������รือ��าย���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:58
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "�ำห��ว�า Empathy สามาร������รือ��าย���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "�ำห��ว�า Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี�า���ร��รมอื�����ล�วหรือยั�"
 
 #: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "�ำห��ว�า Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี�า���ร��รมอื�����ล�วหรือยั�"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "�ำห��ว�า�ะ�ห� Empathy ���าระ�����ั��ี�อ��ุ���ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:60
 msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "�ำห��ว�า�ะ�ห� Empathy ���าระ�����ั��ี�อ��ุ���ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�หรือ�ม�"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "�ำห��ว�า Empathy �วรล��วามละ�อีย��อ��ำ�ห����ี��ั����ื�อ�วาม����ส�ว��ัวหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:61
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr "�ำห��ว�า Empathy �วรล��วามละ�อีย��อ��ำ�ห����ี��ั����ื�อ�วาม����ส�ว��ัวหรือ�ม�"
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "�ำห��ว�า�ะ�ห� Empathy ���รู�����ัว�อ��ู��ิ���อ�����อ�อ��อ�ห��า��า�ส���าหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:62
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr "�ำห��ว�า�ะ�ห� Empathy ���รู�����ัว�อ��ู��ิ���อ�����อ�อ��อ�ห��า��า�ส���าหรือ�ม�"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "�ำห��ว�า�ะ��ิ������รื�อ�มือ�ั��า�อ� WebKit ���� ��รื�อ�มือ���าสั�����ว�� หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:63
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
 "�ำห��ว�า�ะ�����ร��รม�ั��าร�าร��ื�อม��อ���าร�ั��าร��ื�อม��อ/��ื�อม��อ�หม���ยอั���มั�ิหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+msgid "Whether the Salut account has been created on the first Empathy run."
 msgstr "�ำห��ว�า���สร�า��ั��ี Salut ���ล�วหรือยั� �มื�อ�รีย� Empathy �รั���ร�"
 
 #: ../data/empathy.schemas.in.h:65
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr "�ำห��ว�า�ะ�รว��ัวสะ���อ��ำ�ี���อ��ามภาษา�ี��ุ���อ��าร�ะ�รว�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "�ำห��ว�า�ะ��ล���อ�วามรู�สีห��า (smiley) ����ภา��รา�ิ�ส�หรือ�ม���ห��า��า�ส���า"
 
 #: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อ���าสู�ระ����รือ��ายหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:68
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อออ��า�ระ����รือ��ายหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for events."
+msgid "Whether to play a sound to notify of events."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ห�ุ��ี�ยว�ั��ห�ุ�าร����า�� หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for incoming messages."
+msgid "Whether to play a sound to notify of incoming messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ������อ�วาม���าหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for new conversations."
+msgid "Whether to play a sound to notify of new conversations."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส���า�หม�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound to notify for outgoing messages."
+msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส����อ�วามออ�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging in a network."
+msgid "Whether to play a sound when logging into a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อ���าสู�ระ����รือ��ายหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play a sound when logging off a network."
+msgid "Whether to play a sound when logging out of a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อออ��า�ระ����รือ��ายหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:75
-msgid "Whether or not to play sound notifications when away or busy."
+msgid "Whether to play sound notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ล���สีย��มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:76
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:77
-msgid "Whether or not to show a popup notification when a contact goes online."
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:78
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether 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:79
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อ���รั���อ�วาม�หม�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:80
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "�ำห��ว�า�ะ�ส��รู�����ัว�อ��ู��ิ���อ��ราย�ื�อ�ู��ิ���อ�ละ��ห��า��า�ส���าหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show contacts that are offline in the contact list."
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr "�ำห��ว�า�ะ�ส���ู��ิ���อ�ี�ออ��ล����ราย�ื�อ�ู��ิ���อ��วยหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether to show popup notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ุ���อ�วาม�����ห�ุ�มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:83
-msgid "Whether or not to show protocols for contacts in the contact list."
+msgid "Whether to show protocols for contacts in the contact list."
 msgstr "�ำห��ว�า�ะ�ส����ร���อล�อ��ู��ิ���อ��ราย�ื�อ�ู��ิ���อหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:84
-msgid "Whether or not to show the contact list in chat rooms."
+msgid "Whether to show the contact list in chat rooms."
 msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ��ห�อ�ส���า��า�� หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:85
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "�ำห��ว�า�ะ�ส���ล�อ���อ�วาม��ี�ยว�ั�วิ�ี�ิ�ห��า��า�หลั���วย�ุ�ม 'x' �����หัวห��า��า�หรือ�ม�"
+msgid "Whether to show the contact list in compact mode."
+msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ����ระ�ั�หรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:86
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ����ระ�ั�หรือ�ม�"
+msgid ""
+"Whether 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:87
-msgid "Whether to use the theme for chat rooms or not."
+msgid "Whether to use the theme for chat rooms."
 msgstr "�ำห��ว�า�ะ����ุ��������ั�ห�อ�ส���าหรือ�ม�"
 
 #: ../data/empathy.schemas.in.h:88
 msgid ""
-"Which criterion 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 "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
 "��อ�ำห���าร�รีย�ลำ�ั�ราย�ื�อ�ู��ิ���อ ��า�ริยาย�ือ�รีย�ลำ�ั��าม�ื�อ�ู��ิ���อ ��ย�����า \"name\" "
 "��า�ะ�รีย��ามส�า�ะ�อ��ู��ิ���อ����� \"state\""
 
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:840
 msgid "The hash of the received file and the sent one do not match"
 msgstr "��า�ฮ��อ����ม�ี�รั��ั��อ����ม�ี�ส���ม��ร��ั�"
 
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1100
 msgid "File transfer not supported by remote contact"
 msgstr "�ู��ิ���ออี��ั��ห�ึ���ม�รอ�รั��าร��าย�อ����ม"
 
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1158
 msgid "The selected file is not a regular file"
 msgstr "���ม�ี��ลือ��ม�������ม���ิ"
 
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is empty"
 msgstr "���ม�ี��ลือ�ว�า���ล�า"
 
-#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:96
 msgid "People nearby"
 msgstr "�ู�����ว�ี�"
 
@@ -487,7 +473,7 @@ msgid "Away"
 msgstr "�ม�อยู�"
 
 #: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
+msgid "Invisible"
 msgstr "��อ��ัว"
 
 #: ../libempathy/empathy-utils.c:247
@@ -499,8 +485,8 @@ msgid "No reason specified"
 msgstr "�ม�มี�ารระ�ุสา�ห�ุ"
 
 #: ../libempathy/empathy-utils.c:288
-msgid "User requested disconnect"
-msgstr "�ู�����อ�ั��าร��ื�อม��อ"
+msgid "Status is set to offline"
+msgstr "ส�า�ะ��ลี�ย�����ออ��ล��"
 
 #: ../libempathy/empathy-utils.c:290
 msgid "Network error"
@@ -612,11 +598,11 @@ msgstr "�ั��หม�"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1317
+#: ../libempathy-gtk/empathy-account-widget.c:1329
 msgid "L_og in"
 msgstr "�_��าระ��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1381
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -624,15 +610,15 @@ msgstr "�_��าระ��"
 msgid "Account:"
 msgstr "�ั��ี:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1392
+#: ../libempathy-gtk/empathy-account-widget.c:1407
 msgid "Enabled"
 msgstr "��ิ����"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1454
+#: ../libempathy-gtk/empathy-account-widget.c:1472
 msgid "This account already exists on the server"
 msgstr "�ั��ี�ี�มีอยู��ล�ว�ี���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1457
+#: ../libempathy-gtk/empathy-account-widget.c:1475
 msgid "Create a new account on the server"
 msgstr "สร�า��ั��ี�หม��ี���ิร���วอร�"
 
@@ -641,25 +627,25 @@ msgstr "สร�า��ั��ี�หม��ี���ิร���
 #. * 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.
-#: ../libempathy-gtk/empathy-account-widget.c:1839
+#: ../libempathy-gtk/empathy-account-widget.c:1858
 #, 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"
-#: ../libempathy-gtk/empathy-account-widget.c:1857
+#: ../libempathy-gtk/empathy-account-widget.c:1876
 #, c-format
 msgid "%s Account"
 msgstr "�ั��ี %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1861
+#: ../libempathy-gtk/empathy-account-widget.c:1880
 msgid "New 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>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>�ัวอย�า�:</b> MyScreenName"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -668,7 +654,7 @@ msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> MyScreenName</span
 #: ../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:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "�ั��สู�"
@@ -678,7 +664,7 @@ msgstr "�ั��สู�"
 #: ../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:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "_รหัส��า�:"
@@ -716,8 +702,8 @@ msgstr "��ิร���_วอร�:"
 
 #: ../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>"
+msgid "<b>Example:</b> username"
+msgstr "<b>�ัวอย�า�:</b> username"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -734,8 +720,8 @@ msgid "What is your GroupWise password?"
 msgstr "รหัส��า� GroupWise �อ��ุ��ืออะ�ร?"
 
 #: ../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>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>�ัวอย�า�:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
@@ -751,7 +737,7 @@ msgstr "รหัส��า� ICQ �อ��ุ��ืออะ�ร?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
+msgid "_Character set:"
 msgstr "รหัส_อั��ระ:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.c:244
@@ -792,7 +778,7 @@ msgid "None"
 msgstr "�ม����"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
 msgstr "รหัสอั��ระ:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -824,12 +810,12 @@ 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>"
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>�ัวอย�า�:</b> user gmail com"
 
 #: ../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>"
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>�ัวอย�า�:</b> user jabber org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
@@ -880,20 +866,20 @@ msgid "_Ignore SSL certificate errors"
 msgstr "�_ม�ส�����อ�ิ��ลา��อ���รั�รอ� SSL"
 
 #: ../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>"
+msgid "<b>Example:</b> user hotmail com"
+msgstr "<b>�ัวอย�า�:</b> user hotmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "รหัส��า� Windows Live �อ��ุ��ืออะ�ร?"
+msgid "What is your Windows Live ID?"
+msgstr "ID สำหรั� Windows Live �อ��ุ��ืออะ�ร?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "�ื�อ�ู���� Windows Live �อ��ุ��ืออะ�ร?"
+msgid "What is your Windows Live password?"
+msgstr "รหัส��า�สำหรั� Windows Live �อ��ุ��ืออะ�ร?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "_อี�มล:"
+msgid "_E-mail address:"
+msgstr "�ี�อยู�_อี�มล:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
@@ -916,67 +902,67 @@ msgid "_Published Name:"
 msgstr "�ื�อ�ี�_�ระ�าศ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<b>Keep-Alive Options</b>"
-msgstr "<b>�ัว�ลือ��าร���าร��ื�อม��อ</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "<b>Miscellaneous Options</b>"
-msgstr "<b>�ัว�ลือ�������ล��</b>"
+msgid "<b>Example:</b> user my sip server"
+msgstr "<b>�ัวอย�า�:</b> user my sip server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>NAT Traversal Options</b>"
-msgstr "<b>�ัว�ลือ�สำหรั��ส���า� NAT</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "<b>Proxy Options</b>"
-msgstr "<b>�ัว�ลือ�สำหรั��ร�อ��ี</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
-msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> user my sip server</span>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Authentication username:"
 msgstr "�ื�อ�ู����สำหรั�ยื�ยั��ัว�ุ��ล:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
 msgstr "���หา Binding"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
 msgstr "���หา��ิร���วอร� STUN ��ยอั���มั�ิ"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "Hostname of the proxy for outbound requests."
 msgstr "�ื�อ�ฮส���อ��ร�อ��ีสำหรั��าร�รีย��าออ�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "��ว��วลา (วิ�า�ี)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr "�ัว�ลือ��าร���าร��ื�อม��อ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid ""
 "Look up the DNS SRV record at the service's domain for the host name of a "
 "STUN server."
 msgstr "��ิ���อมูล SRV �อ� DNS �ี����ม��อ��ริ�าร ��ื�อหา�ื�อ�ฮส���อ���ิร���วอร� STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Loose Routing"
 msgstr "����าร�ั��ส���า����หลวม"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Mechanism:"
 msgstr "�ล��:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "�ัว�ลือ�������ล��"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "�ัว�ลือ�สำหรั��ส���า� NAT"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Port of the proxy for outbound requests."
 msgstr "�อร���อ��ร�อ��ีสำหรั��าร�รีย��าออ�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Port:"
 msgstr "�อร��:"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "�ัว�ลือ�สำหรั��ร�อ��ี"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "��ิร���วอร� STUN:"
@@ -1021,8 +1007,8 @@ msgid "_Username:"
 msgstr "_�ื�อ�ู����:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "��� Yahoo �ี��ุ�_�"
+msgid "Use _Yahoo! Japan"
+msgstr "��� Yahoo! �ี��ุ�_�"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "What is your Yahoo! ID?"
@@ -1033,11 +1019,11 @@ msgid "What is your Yahoo! password?"
 msgstr "รหัส��า� Yahoo! �อ��ุ��ืออะ�ร?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "_�ั��ี Yahoo:"
+msgid "Yahoo! I_D:"
+msgstr "_�ั��ี Yahoo!:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
 msgstr "�_ม�ส����าร��ิ����าห�อ��ระ�ุม�ละห�อ�ส���า"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -1050,7 +1036,7 @@ msgid "Couldn't convert image"
 msgstr "�ม�สามาร���ล�รู�ภา����"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+msgid "None of the accepted image formats are supported on your system"
 msgstr "ระ���อ��ุ��ม�รอ�รั��อร��ม�รู�ภา���� �ี���ร��รมยอมรั��ลย"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:915
@@ -1073,143 +1059,143 @@ msgstr "�ุ����ม"
 msgid "Click to enlarge"
 msgstr "�ลิ���ื�อ�ยาย"
 
-#: ../libempathy-gtk/empathy-chat.c:199
+#: ../libempathy-gtk/empathy-chat.c:201
 msgid "Failed to reconnect this chat"
 msgstr "��ื�อม��อ�ารส���า�ี���ำ�ม�สำ�ร��"
 
-#: ../libempathy-gtk/empathy-chat.c:621
-msgid "Failed to join chatroom"
+#: ../libempathy-gtk/empathy-chat.c:623
+msgid "Failed to join chat room"
 msgstr "���าห�อ�ส���า�ม�สำ�ร��"
 
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:641
 msgid "Failed to open private chat"
 msgstr "��ิ��ารส���าส�ว��ัว�ม�สำ�ร��"
 
-#: ../libempathy-gtk/empathy-chat.c:678
+#: ../libempathy-gtk/empathy-chat.c:680
 msgid "Topic not supported on this conversation"
 msgstr "�ม�รอ�รั��าร�ั��หัว��อ���ารส���า�ี�"
 
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:686
 msgid "You are not allowed to change the topic"
 msgstr "�ุ��ม����รั�อ�ุ�า��ห���ลี�ย�หัว��อ���"
 
-#: ../libempathy-gtk/empathy-chat.c:802
-msgid "/clear, clear all messages from the current conversation"
-msgstr "/clear, ล�า���อ�วาม�ั��หม�ออ��า��ารส���า�ั��ุ�ั�"
+#: ../libempathy-gtk/empathy-chat.c:815
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: ล�า���อ�วาม�ั��หม�ออ��า��ารส���า�ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:805
-msgid "/topic <topic>, set the topic of the current conversation"
-msgstr "/topic <หัว��อ>, �ั��หัว��อ�อ��ารส���า�ั��ุ�ั�"
+#: ../libempathy-gtk/empathy-chat.c:818
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <หัว��อ>: �ั��หัว��อ�อ��ารส���า�ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:808
-msgid "/join <chatroom id>, join a new chatroom"
-msgstr "/join <�ื�อห�อ�ส���า>, ���าห�อ�ส���าห�อ��หม�"
+#: ../libempathy-gtk/empathy-chat.c:821
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <�ื�อห�อ�ส���า>: ���าห�อ�ส���าห�อ��หม�"
 
-#: ../libempathy-gtk/empathy-chat.c:811
-msgid "/j <chatroom id>, join a new chatroom"
-msgstr "/j <�ื�อห�อ�ส���า>, ���าห�อ�ส���าห�อ��หม�"
+#: ../libempathy-gtk/empathy-chat.c:824
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <�ื�อห�อ�ส���า>: ���าห�อ�ส���าห�อ��หม�"
 
-#: ../libempathy-gtk/empathy-chat.c:814
-msgid "/query <contact id> [<message>], open a private chat"
-msgstr "/query <�ื�อ�ู��ิ���อ> [<��อ�วาม>], ��ิ��ารส���าส�ว��ัว"
+#: ../libempathy-gtk/empathy-chat.c:827
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <�ื�อ�ู��ิ���อ> [<��อ�วาม>]: ��ิ��ารส���าส�ว��ัว"
 
-#: ../libempathy-gtk/empathy-chat.c:817
-msgid "/msg <contact id> <message>, open a private chat"
-msgstr "/msg <�ื�อ�ู��ิ���อ> [<��อ�วาม>], ��ิ��ารส���าส�ว��ัว"
+#: ../libempathy-gtk/empathy-chat.c:830
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <�ื�อ�ู��ิ���อ> <��อ�วาม>: ��ิ��ารส���าส�ว��ัว"
 
-#: ../libempathy-gtk/empathy-chat.c:820
-msgid "/nick <nickname>, change your nickname on current server"
-msgstr "/nick <�ื�อ�ล��>, ��ลี�ย��ื�อ�ล���อ��ุ�����ิร���วอร��ั��ุ�ั�"
+#: ../libempathy-gtk/empathy-chat.c:833
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <�ื�อ�ล��>: ��ลี�ย��ื�อ�ล���อ��ุ�����ิร���วอร��ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:823
-msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr "/me <��อ�วาม>, ส����อ�วาม ACTION (�าร�ระ�ำ���ั��ุ�ั�) ���า�����ารส���า�ั��ุ�ั�"
+#: ../libempathy-gtk/empathy-chat.c:836
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <��อ�วาม>: ส����อ�วาม ACTION (�าร�ระ�ำ���ั��ุ�ั�) ���า�����ารส���า�ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:839
 msgid ""
-"/say <message>, send <message> to the current conversation. This is used to "
+"/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chatroom\""
+"join a new chat room\""
 msgstr ""
-"/say <��อ�วาม>, ส�� <��อ�วาม> ���า�����ารส���า�ั��ุ�ั� ���สำหรั�ส����อ�วาม�ี��ึ�������วย '/' "
+"/say <��อ�วาม>: ส�� <��อ�วาม> ���า�����ารส���า�ั��ุ�ั� ���สำหรั�ส����อ�วาม�ี��ึ�������วย '/' "
 "�ัวอย�า����� \"/say /join ���สำหรั����าห�อ�ส���าห�อ��หม�\""
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:844
 msgid ""
-"/help [<command>], show all supported commands. If <command> is defined, "
+"/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
-msgstr "/help [<�ำสั��>], �ส���ำสั���ั��หม��ี�รอ�รั� ��าระ�ุ <�ำสั��> ��วย ���ะ�ส��วิ�ี����ำสั���ั��"
+msgstr "/help [<�ำสั��>]: �ส���ำสั���ั��หม��ี�รอ�รั� ��าระ�ุ <�ำสั��> ��วย ���ะ�ส��วิ�ี����ำสั���ั��"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:854
 #, c-format
 msgid "Usage: %s"
 msgstr "วิ�ี���: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:883
 msgid "Unknown command"
 msgstr "�ม�รู��ั��ำสั���ี�"
 
-#: ../libempathy-gtk/empathy-chat.c:991
-msgid "Unknown command, see /help for the available commands"
+#: ../libempathy-gtk/empathy-chat.c:1004
+msgid "Unknown command; see /help for the available commands"
 msgstr "�ม�รู��ั��ำสั���ี� �ู�ำสั���ี�����������า� /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1130
+#: ../libempathy-gtk/empathy-chat.c:1143
 msgid "offline"
 msgstr "ออ��ล��"
 
-#: ../libempathy-gtk/empathy-chat.c:1133
+#: ../libempathy-gtk/empathy-chat.c:1146
 msgid "invalid contact"
 msgstr "��อมูล�ู��ิ���อ�ิ��ลา�"
 
-#: ../libempathy-gtk/empathy-chat.c:1136
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "permission denied"
 msgstr "�ม����รั�อ�ุ�า�"
 
-#: ../libempathy-gtk/empathy-chat.c:1139
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "too long message"
 msgstr "��อ�วามยาว��ิ���"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "not implemented"
 msgstr "ยั��ม��ำ"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "unknown"
 msgstr "�ม��รา�"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1162
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะส����อ�วาม '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1192
 #, c-format
 msgid "Topic set to: %s"
 msgstr "หัว��อ�ู��ั������: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1194
 msgid "No topic defined"
 msgstr "�ม�มี�าร�ำห��หัว��อ"
 
-#: ../libempathy-gtk/empathy-chat.c:1554
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "(No Suggestions)"
 msgstr "(�ม�มี�ำ��ะ�ำ)"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1647
 msgid "Insert Smiley"
 msgstr "��ร�รู�สีห��า"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1626
-#: ../libempathy-gtk/empathy-ui-utils.c:1657
+#: ../libempathy-gtk/empathy-chat.c:1665
+#: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "_ส��"
 
-#: ../libempathy-gtk/empathy-chat.c:1660
+#: ../libempathy-gtk/empathy-chat.c:1699
 msgid "_Spelling Suggestions"
 msgstr "�_�ะ�ำ�ัวสะ��"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1814
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s �ั��าร��ื�อม��อ�ล�ว"
@@ -1217,12 +1203,12 @@ msgstr "%s �ั��าร��ื�อม��อ�ล�ว"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1782
+#: ../libempathy-gtk/empathy-chat.c:1821
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s �ู� %2$s ��ะออ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1785
+#: ../libempathy-gtk/empathy-chat.c:1824
 #, c-format
 msgid "%s was kicked"
 msgstr "%s �ู���ะออ�"
@@ -1230,17 +1216,17 @@ 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:1793
+#: ../libempathy-gtk/empathy-chat.c:1832
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s �ู� %2$s ห�าม�ม��ห����า"
 
-#: ../libempathy-gtk/empathy-chat.c:1796
+#: ../libempathy-gtk/empathy-chat.c:1835
 #, c-format
 msgid "%s was banned"
 msgstr "%s �ู�ห�าม�ม��ห����า"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1839
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ออ��า�ห�อ�"
@@ -1250,63 +1236,63 @@ msgstr "%s ออ��า�ห�อ�"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1809
+#: ../libempathy-gtk/empathy-chat.c:1848
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1873
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ���ามา��ห�อ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-chat.c:1898
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��ลี�ย��ื�อ���� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
+#: ../libempathy-gtk/empathy-chat.c:2033 ../src/empathy-call-window.c:1531
 msgid "Disconnected"
 msgstr "�ั��าร��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:2521
+#: ../libempathy-gtk/empathy-chat.c:2568
 msgid "Wrong password; please try again:"
 msgstr "รหัส��า��ม��ู���อ� �รุ�าลอ��หม�:"
 
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2569
 msgid "Retry"
 msgstr "ลอ��หม�"
 
-#: ../libempathy-gtk/empathy-chat.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "This room is protected by a password:"
 msgstr "ห�อ��ี����รหัส��า���อ��ั��ว�:"
 
-#: ../libempathy-gtk/empathy-chat.c:2528
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Join"
 msgstr "���าห�อ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2668
+#: ../libempathy-gtk/empathy-chat.c:2715
 msgid "Connected"
 msgstr "��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:2721
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../libempathy-gtk/empathy-log-window.c:548
 msgid "Conversation"
 msgstr "�ารส���า"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:679
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:681
 msgid "Topic:"
 msgstr "หัว��อ:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:817
+#: ../libempathy-gtk/empathy-theme-adium.c:823
 msgid "_Copy Link Address"
 msgstr "_�ั�ลอ��ี�อยู�ลิ���"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:824
+#: ../libempathy-gtk/empathy-theme-adium.c:830
 msgid "_Open Link"
 msgstr "_��ิ�ลิ���"
 
@@ -1336,34 +1322,35 @@ msgstr "�ั�สิ���ภายห_ลั�"
 msgid "Subscription Request"
 msgstr "�อสมั�ร"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1557
+#: ../libempathy-gtk/empathy-contact-list-view.c:1512
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ยื�ยั��ี��ะล��ลุ�ม '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1559
+#: ../libempathy-gtk/empathy-contact-list-view.c:1514
 msgid "Removing group"
 msgstr "�ำลั��ะล��ลุ�ม"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1606
-#: ../libempathy-gtk/empathy-contact-list-view.c:1683
+#: ../libempathy-gtk/empathy-contact-list-view.c:1561
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "_ล�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1636
+#: ../libempathy-gtk/empathy-contact-list-view.c:1591
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ยื�ยั��ี��ะล��ู��ิ���อ '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../libempathy-gtk/empathy-contact-list-view.c:1593
 msgid "Removing contact"
 msgstr "�ำลั��ะล��ู��ิ���อ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:195
 #: ../src/empathy-main-window.ui.h:14
-msgid "_Add Contact..."
-msgstr "�_�ิ�ม�ู��ิ���อ..."
+msgid "_Add Contactâ?¦"
+msgstr "�_�ิ�ม�ู��ิ���อ�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:222
 #: ../src/empathy-main-window.ui.h:15
@@ -1403,143 +1390,144 @@ msgid "_Edit"
 msgstr "�_����"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../src/empathy-chat-window.c:864
+#: ../src/empathy-chat-window.c:866
 msgid "Inviting you to this room"
 msgstr "��ิ��ุ����าห�อ��ี�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:527
-msgid "_Invite to chatroom"
+msgid "_Invite to chat room"
 msgstr "�_�ิ����าห�อ�ส���า"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "�ลือ��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "�ั��ึ�รู�����ัว"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "�ม�สามาร��ั��ึ�รู�����ัว"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:235
 msgid "Select"
 msgstr "�ลือ�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1010
-#: ../src/empathy-main-window.c:1038
+#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../src/empathy-main-window.c:1053
 msgid "Group"
 msgstr "�ลุ�ม"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:476
 msgid "Country ISO Code:"
 msgstr "รหัส ISO �อ��ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:478
 msgid "Country:"
 msgstr "�ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:480
 msgid "State:"
 msgstr "รั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:482
 msgid "City:"
 msgstr "�มือ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:484
 msgid "Area:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:486
 msgid "Postal Code:"
 msgstr "รหัส��รษ�ีย�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:488
 msgid "Street:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:490
 msgid "Building:"
 msgstr "อา�าร:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:492
 msgid "Floor:"
 msgstr "�ั��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:494
 msgid "Room:"
 msgstr "ห�อ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:496
 msgid "Text:"
 msgstr "��อ�วาม:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:498
 msgid "Description:"
 msgstr "�ำ�รรยาย:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:500
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1287
+#: ../libempathy-gtk/empathy-contact-widget.c:502
 msgid "Accuracy Level:"
 msgstr "ระ�ั��วามละ�อีย�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1289
+#: ../libempathy-gtk/empathy-contact-widget.c:504
 msgid "Error:"
 msgstr "�วาม�ลา���ลื�อ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1291
+#: ../libempathy-gtk/empathy-contact-widget.c:506
 msgid "Vertical Error (meters):"
 msgstr "�วาม�ลา���ลื�อ���ว�ั�� (�ม�ร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1293
+#: ../libempathy-gtk/empathy-contact-widget.c:508
 msgid "Horizontal Error (meters):"
 msgstr "�วาม�ลา���ลื�อ���ว�อ� (�ม�ร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1295
+#: ../libempathy-gtk/empathy-contact-widget.c:510
 msgid "Speed:"
 msgstr "อั�รา�ร�ว:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1297
+#: ../libempathy-gtk/empathy-contact-widget.c:512
 msgid "Bearing:"
 msgstr "�ิศ�า�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1299
+#: ../libempathy-gtk/empathy-contact-widget.c:514
 msgid "Climb Speed:"
 msgstr "อั�รา�ร�ว���ระ�ั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1301
+#: ../libempathy-gtk/empathy-contact-widget.c:516
 msgid "Last Updated on:"
 msgstr "�รั���อมูลล�าสุ��มื�อ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1303
+#: ../libempathy-gtk/empathy-contact-widget.c:518
 msgid "Longitude:"
 msgstr "ลอ��ิ�ู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1305
+#: ../libempathy-gtk/empathy-contact-widget.c:520
 msgid "Latitude:"
 msgstr "ละ�ิ�ู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1307
+#: ../libempathy-gtk/empathy-contact-widget.c:522
 msgid "Altitude:"
 msgstr "ระ�ั��วามสู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1368
-msgid "<b>Location</b>"
-msgstr "<b>�ำ�ห����ี��ั��</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "�ำ�ห����ี��ั��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1381
+#: ../libempathy-gtk/empathy-contact-widget.c:600
 msgid "<b>Location</b>, "
 msgstr "<b>�ำ�ห����ี��ั��</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1431
+#: ../libempathy-gtk/empathy-contact-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Ey �วลา %R UTC"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:721
+msgid "Save Avatar"
+msgstr "�ั��ึ�รู�����ัว"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+msgid "Unable to save avatar"
+msgstr "�ม�สามาร��ั��ึ�รู�����ัว"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>�ำ�ห����ี��ั��</b> �มื�อ (วั�-�วลา)\t"
@@ -1561,40 +1549,35 @@ msgid "Client:"
 msgstr "��ร��รมลู���าย:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1021
-msgid "Contact"
-msgstr "�ู��ิ���อ"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Contact Details"
 msgstr "รายละ�อีย��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "อี�มล:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "�ี�อยู�อี�มล:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
 msgstr "�ื�อ���ม:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Groups"
 msgstr "�ลุ�ม"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 msgid "Identifier:"
 msgstr "�ื�อ�ระ�ำ�ัว:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "ร�อ��อ��อมูล���ล�ว..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "ร�อ��อ��อมูล���ล�ว#x2026;"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1602,15 +1585,15 @@ msgstr ""
 "�ลือ��ลุ�ม�ี���อ��าร�ั��ห��ู��ิ���อ�ี�อยู� สั����ว�า�ุ�สามาร��ลือ����มา��ว�าห�ึ���ลุ�ม "
 "หรือ�ะ�ม��ลือ��ลุ�ม�ลย�����"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid "Version:"
 msgstr "รุ��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
 msgstr "�ว������:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "_Add Group"
 msgstr "�_�ิ�ม�ลุ�ม"
 
@@ -1630,12 +1613,12 @@ msgstr "�อร��"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../libempathy-gtk/empathy-log-window.c:541
 #: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "�ั��ี"
 
-#: ../libempathy-gtk/empathy-log-window.c:556
+#: ../libempathy-gtk/empathy-log-window.c:558
 msgid "Date"
 msgstr "วั��ี�"
 
@@ -1693,13 +1676,13 @@ msgstr "�าร�รีย�สาย�หม�"
 #. COL_TYPE
 #: ../libempathy-gtk/empathy-presence-chooser.c:167
 #: ../libempathy-gtk/empathy-presence-chooser.c:203
-msgid "Custom Message..."
-msgstr "��อ�วาม�ำห���อ�..."
+msgid "Custom Messageâ?¦"
+msgstr "��อ�วาม�ำห���อ��"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
 #: ../libempathy-gtk/empathy-presence-chooser.c:222
-msgid "Edit Custom Messages..."
-msgstr "�������อ�วาม�ำห���อ�..."
+msgid "Edit Custom Messagesâ?¦"
+msgstr "�������อ�วาม�ำห���อ��"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to remove this status as a favorite"
@@ -1719,8 +1702,20 @@ msgstr "�ำห��ส�า�ะอยู�/�ม�อยู��อ
 
 #. Custom messages
 #: ../libempathy-gtk/empathy-presence-chooser.c:1083
-msgid "Custom messages..."
-msgstr "��อ�วาม�ำห���อ�..."
+msgid "Custom messagesâ?¦"
+msgstr "��อ�วาม�ำห���อ��"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "หา:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "�ัว�ิม���ห��-�ล���ร��ั�"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "หา�ม���"
 
 #: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
@@ -1794,15 +1789,15 @@ msgstr "สะอา�"
 msgid "Blue"
 msgstr "��ำ��ิ�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1519
+#: ../libempathy-gtk/empathy-ui-utils.c:1520
 msgid "Unable to open URI"
 msgstr "�ม�สามาร���ิ� URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1649
+#: ../libempathy-gtk/empathy-ui-utils.c:1650
 msgid "Select a file"
 msgstr "�ลือ����ม"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1709
+#: ../libempathy-gtk/empathy-ui-utils.c:1710
 msgid "Select a destination"
 msgstr "�ลือ��ี������ลาย�า�"
 
@@ -1974,11 +1969,11 @@ msgid "Vietnamese"
 msgstr "�วีย��าม"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The contact selected cannot receive files."
+msgid "The selected contact cannot receive files."
 msgstr "�ู��ิ���อ�ี��ลือ��ม�สามาร�รั����ม���"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The contact selected is offline."
+msgid "The selected contact is offline."
 msgstr "�ู��ิ���อ�ี��ลือ�ออ��ล��อยู�"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
@@ -1989,19 +1984,19 @@ msgstr "�ม�มีรายละ�อีย���อ�ิ��ลา
 msgid "Instant Message (Empathy)"
 msgstr "��อ�วาม�ั��� (Empathy)"
 
-#: ../src/empathy.c:893
+#: ../src/empathy.c:762
 msgid "Don't connect on startup"
 msgstr "�ม���อ���ื�อม��อ��ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:897
+#: ../src/empathy.c:766
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�ม���อ��ส��ราย�ื�อ�ู��ิ���อหรือ�ล�อ�����อ�อื������ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:901
+#: ../src/empathy.c:770
 msgid "Show the accounts dialog"
 msgstr "�ส���ล�อ�����อ��ั��ี"
 
-#: ../src/empathy.c:913
+#: ../src/empathy.c:782
 msgid "- Empathy IM Client"
 msgstr "- ลู���าย IM Empathy"
 
@@ -2050,28 +2045,28 @@ msgstr ""
 "��ามี�วลา��ร�มา��วย�ั���ล :-)\n"
 "http://gnome-th.sf.net";
 
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:165
+msgid "There was an error while importing the accounts."
 msgstr "��ิ���อ�ิ��ลา���ะ�ำ���า�ั��ี"
 
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:168
+msgid "There was an error while parsing the account details."
 msgstr "��ิ���อ�ิ��ลา���ะ���รายละ�อีย��ั��ี"
 
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:171
+msgid "There was an error while creating the account."
 msgstr "��ิ���อ�ิ��ลา���ะสร�า��ั��ี"
 
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error."
 msgstr "��ิ���อ�ิ��ลา�"
 
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:177
 #, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "��อ�ิ��ลา��ือ: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "รายละ�อีย���อ�ิ��ลา��ือ: %s"
 
-#: ../src/empathy-account-assistant.c:149
+#: ../src/empathy-account-assistant.c:181
 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."
@@ -2079,7 +2074,8 @@ msgstr ""
 "�ุ�สามาร��ลั�����อ�รายละ�อีย��อ��ั��ี�อ��ุ��หม� หรือ�ะออ��า���รื�อ�มือ��วย�ี� "
 "�ล�ว��ิ�ม�ั��ี��ภายหลั��า��ม�ู \"�����\" �����"
 
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:218
+#: ../src/empathy-account-assistant.c:1241
 msgid "An error occurred"
 msgstr "��ิ���อ�ิ��ลา�"
 
@@ -2089,37 +2085,36 @@ msgstr "��ิ���อ�ิ��ลา�"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:331
-#: ../src/empathy-accounts-dialog.c:1486
+#: ../src/empathy-account-assistant.c:395 ../src/empathy-accounts-dialog.c:552
 #, c-format
 msgid "New %s account"
 msgstr "�ั��ี %s �หม�"
 
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:472
 msgid "What kind of chat account do you have?"
 msgstr "�ุ�มี�ั��ีส���า��ิ��ห�?"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:478
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "�ุ�มี�ั��ีส���าอื���ี���อ��าร�ั����าอี�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:415
+#: ../src/empathy-account-assistant.c:484
 msgid "Enter your account details"
 msgstr "��อ�รายละ�อีย��อ��ั��ี�อ��ุ�"
 
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:489
 msgid "What kind of chat account do you want to create?"
 msgstr "�ุ���อ��ารสร�า��ั��ีส���า��ิ��ห�?"
 
-#: ../src/empathy-account-assistant.c:426
+#: ../src/empathy-account-assistant.c:495
 msgid "Do you want to create other chat accounts?"
 msgstr "�ุ���อ��าร��ิ�ม�ั��ีส���าอื��อี�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:433
+#: ../src/empathy-account-assistant.c:502
 msgid "Enter the details for the new account"
 msgstr "��อ�รายละ�อีย��อ��ั��ี�หม��ี��ะสร�า�"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:617
 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 "
@@ -2130,54 +2125,94 @@ msgstr ""
 "Talk, AIM, Windows Live �ละ��ร��รมส���าอื��� อี�มา�มาย �ละ��า����ม��ร���หรือ�ว����ม "
 "�ุ���ยั�สามาร��ู��ุย��วย�สีย�หรือภา������วย"
 
-#: ../src/empathy-account-assistant.c:536
+#: ../src/empathy-account-assistant.c:634
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "�ุ�มี�ั��ี�ี�����ั���ร��รมส���าอื��อยู�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:559
+#: ../src/empathy-account-assistant.c:657
 msgid "Yes, import my account details from "
 msgstr "มี ��วย�ำ���า��อมูล�ั��ี�อ���า����า�า� "
 
-#: ../src/empathy-account-assistant.c:580
+#: ../src/empathy-account-assistant.c:678
 msgid "Yes, I'll enter my account details now"
 msgstr "มี ��า����า�ะ��อ���อมูล�ั��ี�อ���า����า��ี�ยว�ี�"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:700
 msgid "No, I want a new account"
 msgstr "�ม�มี ��า����า��อ��ารสร�า��ั��ี�หม�"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:710
 msgid "No, I just want to see people online nearby for now"
 msgstr "�ม�มี ��า����า�����อ��าร�ู�ู����ี�ออ��ล��อยู���ล�� ����ั�����อ��ี�"
 
-#: ../src/empathy-account-assistant.c:633
+#: ../src/empathy-account-assistant.c:731
 msgid "Select the accounts you want to import:"
 msgstr "�ลือ��ั��ี�ี��ุ���อ��าร�ำ���า:"
 
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:815
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "���"
 
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:822
 msgid "No, that's all for now"
 msgstr "�ม� �อ����ั����อ�"
 
-#: ../src/empathy-account-assistant.c:920
+#: ../src/empathy-account-assistant.c:1064
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy สามาร��รว�หา�ู����ี���ื�อม��อ����รือ��าย��ียว�ั��ุ���ื�อส���า��� "
+"��า�ุ���อ��าร����วามสามาร��ี� �รุ�า�รว�สอ���อมูล��า�ล�า��ี�ว�า�ู���อ�หรือ�ม� "
+"�ุ�สามาร���ลี�ย���อมูล�ี���ภายหลั� หรือ�ิ��วามสามาร��ี������ย��าย ��ย����ล�อ�����อ� '�ั��ี'"
+
+#: ../src/empathy-account-assistant.c:1070
+#: ../src/empathy-account-assistant.c:1126
+msgid "Edit->Accounts"
+msgstr "�����->�ั��ี"
+
+#: ../src/empathy-account-assistant.c:1086
+msgid "I don't want to enable this feature for now"
+msgstr "��า����ายั��ม���อ��าร��ิ�����วามสามาร��ี����อ��ี�"
+
+#: ../src/empathy-account-assistant.c:1122
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed.\n"
+"If you want to enable this feature, please install the telepathy-salut "
+"package\n"
+"and create a People Nearby account from the Accounts dialog "
+msgstr ""
+"�ุ��ะ�ม�สามาร�ส���า�ั��ู�������รือ��าย��ียว�ั��ุ���� ��ื�อ��า�ยั��ม�����ิ��ั�� telepathy-salut\n"
+"��า�ุ���อ��าร��ิ�����วามสามาร��ี� �รุ�า�ิ��ั�������� telepathy-salut\n"
+"�ล�วสร�า��ั��ี��ิ� '�ู�����ว�ี�' �า��ล�อ�����อ� '�ั��ี'"
+
+#: ../src/empathy-account-assistant.c:1128
+msgid "telepathy-salut not installed"
+msgstr "�ม�����ิ��ั�� telepathy-salut"
+
+#: ../src/empathy-account-assistant.c:1205
 msgid "Welcome to Empathy"
 msgstr "ยิ��ี��อ�รั�สู� Empathy"
 
-#: ../src/empathy-account-assistant.c:929
+#: ../src/empathy-account-assistant.c:1214
 msgid "Import your existing accounts"
 msgstr "�ำ���า�ั��ี�อ��ุ��ี�มี"
 
+#: ../src/empathy-account-assistant.c:1232
+msgid "Please enter personal details"
+msgstr "�รุ�า��อ���อมูลส�ว��ัว"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #: ../src/empathy-accounts-dialog.c:65
 #, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "มี��อมูล��ี�ยว�ั��ั��ี %s �อ��ุ��ี�ยั��ม�����ั��ึ�"
+msgid "There are unsaved modifications to your %s account."
+msgstr "มี�าร��ลี�ย���ล����ั��ี %s �อ��ุ�ยั��ม�����ั��ึ�"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
@@ -2185,33 +2220,33 @@ msgstr "มี��อมูล��ี�ยว�ั��ั��ี %s 
 msgid "Your new account has not been saved yet."
 msgstr "�ั��ี�หม��อ��ุ�ยั��ม�����ั��ึ�"
 
-#: ../src/empathy-accounts-dialog.c:229 ../src/empathy-call-window.c:729
-msgid "Connecting..."
-msgstr "�ำลั���ื�อม��อ..."
+#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729
+msgid "Connectingâ?¦"
+msgstr "�ำลั���ื�อม��อ�"
 
-#: ../src/empathy-accounts-dialog.c:256
+#: ../src/empathy-accounts-dialog.c:286
 #, c-format
-msgid "Disconnected - %s"
-msgstr "�ั��าร��ื�อม��อ�ล�ว - %s"
+msgid "Disconnected â?? %s"
+msgstr "à¸?ัà¸?à¸?ารà¹?à¸?ืà¹?อมà¸?à¹?อà¹?ลà¹?ว â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:261
+#: ../src/empathy-accounts-dialog.c:291
 #, c-format
-msgid "Offline - %s"
-msgstr "ออ��ล�� - %s"
+msgid "Offline â?? %s"
+msgstr "ออà¸?à¹?ลà¸?à¹? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:274
-msgid "Offline - No Network Connection"
-msgstr "ออ��ล�� - �ม�มี�าร��ื�อม��อ��รือ��าย"
+#: ../src/empathy-accounts-dialog.c:304
+msgid "Offline â?? No Network Connection"
+msgstr "ออà¸?à¹?ลà¸?à¹? â?? à¹?มà¹?มีà¸?ารà¹?à¸?ืà¹?อมà¸?à¹?อà¹?à¸?รือà¸?à¹?าย"
 
-#: ../src/empathy-accounts-dialog.c:282
+#: ../src/empathy-accounts-dialog.c:312
 msgid "Unknown Status"
 msgstr "�ม��รา�ส�า�ะ"
 
-#: ../src/empathy-accounts-dialog.c:293
-msgid "Offline - Account disabled"
-msgstr "ออ��ล�� - �ั��ี�ู�ระ�ั�"
+#: ../src/empathy-accounts-dialog.c:323
+msgid "Offline â?? Account Disabled"
+msgstr "ออà¸?à¹?ลà¸?à¹? â?? à¸?ัà¸?à¸?ีà¸?ูà¸?ระà¸?ัà¸?"
 
-#: ../src/empathy-accounts-dialog.c:613
+#: ../src/empathy-accounts-dialog.c:720
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2219,16 +2254,16 @@ msgstr ""
 "�ุ��ำลั��ะสร�า��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:903
+#: ../src/empathy-accounts-dialog.c:1054
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "�ุ���อ��ารล� %s ออ��า���รื�อ��อ��ุ�หรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:907
+#: ../src/empathy-accounts-dialog.c:1058
 msgid "This will not remove your account on the server."
 msgstr "�ารล��ี��ะ�ม�ล��ั��ี�อ��ุ��ี���ิร���วอร�"
 
-#: ../src/empathy-accounts-dialog.c:1089
+#: ../src/empathy-accounts-dialog.c:1286
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2236,7 +2271,7 @@ msgstr ""
 "�ุ��ำลั��ะ�ลือ��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:1560
+#: ../src/empathy-accounts-dialog.c:1828
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2244,46 +2279,32 @@ msgstr ""
 "�ุ��ำลั��ะ�ิ�ห��า��า� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#.  Translators: this is used only when built on a moblin platform 
-#: ../src/empathy-accounts-dialog.c:1733
-msgid "_Next"
-msgstr "_�ั���"
-
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:1955
 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.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:1
 msgid "No protocol installed"
 msgstr "�ม�มี��ร���อล�ิ��ั��อยู�"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Protocol:"
+msgstr "��ร���อล:"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
 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.ui.h:6
-msgid "_Add..."
-msgstr "�_�ิ�ม..."
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import..."
-msgstr "_�ำ���า..."
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr "�_�ิ�ม&#x2026;"
 
-# This is part of "Add new <type> account" message
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "account"
-msgstr "�หม�"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr "_�ำ���า&#x2026;"
 
 #: ../src/empathy-call-window.c:453
 msgid "Contrast"
@@ -2331,30 +2352,30 @@ msgid "Call"
 msgstr "�าร�ุยสาย"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1700
+#: ../src/empathy-call-window.c:1694
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "à¹?à¸?ืà¹?อมà¸?à¹?อà¹?ลà¹?ว â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:1761
+#: ../src/empathy-call-window.c:1755
 msgid "Technical Details"
 msgstr "รายละ�อีย��า�����ิ�"
 
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:1793
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "�อ����วร��อ� %s �ม�รู��ั��อร��ม��สีย���� �ลย�ี��อม�ิว��อร��อ��ุ�รอ�รั�"
 
-#: ../src/empathy-call-window.c:1804
+#: ../src/empathy-call-window.c:1798
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "�อ����วร��อ� %s �ม�รู��ั��อร��ม�วี�ิ�ัศ����� �ลย�ี��อม�ิว��อร��อ��ุ�รอ�รั�"
 
-#: ../src/empathy-call-window.c:1810
+#: ../src/empathy-call-window.c:1804
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2362,41 +2383,41 @@ msgid ""
 msgstr ""
 "�ม�สามาร���ื�อม��อ��ยั� %s ��� ��าย����ายห�ึ��อา�อยู�����รือ��าย�ี��ม�อ�ุ�า��ห���ื�อม��อ��ย�ร�"
 
-#: ../src/empathy-call-window.c:1816
+#: ../src/empathy-call-window.c:1810
 msgid "There was a failure on the network"
 msgstr "��ิ��วามล�ม�หลว����รือ��าย"
 
-#: ../src/empathy-call-window.c:1820
+#: ../src/empathy-call-window.c:1814
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "�ารรอ�รั��อร��ม��สีย��ี��ำ������อ�������าร�รีย�สาย�ี� ยั��ม�����ิ��ั��ล����อม�ิว��อร��อ��ุ�"
 
-#: ../src/empathy-call-window.c:1823
+#: ../src/empathy-call-window.c:1817
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "�ารรอ�รั��อร��ม�วี�ิ�ัศ���ี��ำ������อ�������าร�รีย�สาย�ี� ยั��ม�����ิ��ั��ล����อม�ิว��อร��อ��ุ�"
 
-#: ../src/empathy-call-window.c:1833
+#: ../src/empathy-call-window.c:1827
 #, c-format
 msgid ""
-"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
 "��ิ�สิ���ม��า��ิ���อ����ระ�อ� Telepathy  �รุ�า <a href=\"%s\">ราย�า��ั���ี�</a> "
 "�ร�อม����ูม�ี�����า�ห��า��า� '�ี�ั��' ���ม�ูวิ�ี�������วย"
 
-#: ../src/empathy-call-window.c:1841
+#: ../src/empathy-call-window.c:1835
 msgid "There was a failure in the call engine"
 msgstr "��ิ��วามล�ม�หลว���ล���าร�รีย�สาย"
 
-#: ../src/empathy-call-window.c:1880
+#: ../src/empathy-call-window.c:1874
 msgid "Can't establish audio stream"
 msgstr "�ม�สามาร���ื�อม��อส�รีม�สีย����"
 
-#: ../src/empathy-call-window.c:1890
+#: ../src/empathy-call-window.c:1884
 msgid "Can't establish video stream"
 msgstr "�ม�สามาร���ื�อม��อส�รีมวี�ิ�ัศ�����"
 
@@ -2468,31 +2489,31 @@ msgstr "�ส���ัวอย�า�วี�ิ�ัศ��"
 msgid "_View"
 msgstr "มุ_มมอ�"
 
-#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#: ../src/empathy-chat-window.c:437 ../src/empathy-chat-window.c:457
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม)"
 
-#: ../src/empathy-chat-window.c:447
+#: ../src/empathy-chat-window.c:449
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (�ละอี� %u ��)"
 
-#: ../src/empathy-chat-window.c:463
+#: ../src/empathy-chat-window.c:465
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม�า���อื��)"
 
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:474
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม�า��ุ���)"
 
-#: ../src/empathy-chat-window.c:683
+#: ../src/empathy-chat-window.c:685
 msgid "Typing a message."
 msgstr "�ำลั��ิม����อ�วาม"
 
@@ -2513,8 +2534,8 @@ msgid "Insert _Smiley"
 msgstr "��ร�รู�_สีห��า"
 
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant..."
-msgstr "��ิ��ู�ร�วมส���า..."
+msgid "Invite _Participantâ?¦"
+msgstr "��ิ��ู�ร�วมส���า�"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -2526,7 +2547,7 @@ msgstr "ย�าย�������า�_�วา"
 
 #: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
-msgstr "_สาร�ั�"
+msgstr "��ื�อ_หา"
 
 #: ../src/empathy-chat-window.ui.h:9
 msgid "_Conversation"
@@ -2537,7 +2558,7 @@ msgid "_Detach Tab"
 msgstr "_�ึ�����ออ�"
 
 #: ../src/empathy-chat-window.ui.h:12
-msgid "_Favorite Chatroom"
+msgid "_Favorite Chat Room"
 msgstr "_ห�อ�ส���า��ร�"
 
 #: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
@@ -2576,89 +2597,76 @@ msgstr "��ื�อม��ออั���มั�ิ"
 msgid "Manage Favorite Rooms"
 msgstr "�ั��ารห�อ���ร�"
 
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
 msgid "Incoming video call"
 msgstr "�าร�รีย����า��ื�อส���า��วยวี�ิ�ัศ��"
 
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
 msgid "Incoming call"
 msgstr "�าร�รีย����า"
 
-#: ../src/empathy-event-manager.c:349
+#: ../src/empathy-event-manager.c:343
 #, c-format
-msgid "%s is video calling you, do you want to answer?"
+msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �ำลั��รีย�สาย�ุ�อยู� ��ื�อส���า��วยวี�ิ�ัศ�� �ุ���อ��าร�ะ�อ�รั�หรือ�ม�?"
 
-#: ../src/empathy-event-manager.c:350
+#: ../src/empathy-event-manager.c:344
 #, c-format
-msgid "%s is calling you, do you want to answer?"
+msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �ำลั��รีย�สาย�ุ�อยู� �ุ���อ��าร�ะ�อ�รั�หรือ�ม�?"
 
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:366
 msgid "_Reject"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:372
 msgid "_Answer"
 msgstr "_�อ�รั�"
 
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "�าร�รีย����า��วยวี�ิ�ัศ���า� %s"
 
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
 #, c-format
 msgid "Incoming call from %s"
 msgstr "�าร�รีย����า�า� %s"
 
-#: ../src/empathy-event-manager.c:541
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s ส���ำ��ิ��ึ��ุ�"
-
-#: ../src/empathy-event-manager.c:547
-msgid "An external application will be started to handle it."
-msgstr "�ะ�รีย���ร��รมภาย�อ���ื�อ�ั��าร�ำ��ิ��ี�"
-
-#: ../src/empathy-event-manager.c:552
-msgid "You don't have the needed external application to handle it."
-msgstr "����ุ��ม�มี��ร��รมภาย�อ��ี��ะ�ั��าร�ำ��ิ��ี�"
-
-#: ../src/empathy-event-manager.c:680
+#: ../src/empathy-event-manager.c:579
 msgid "Room invitation"
 msgstr "�ำ��ิ�สู�ห�อ�ส���า"
 
-#: ../src/empathy-event-manager.c:683
+#: ../src/empathy-event-manager.c:582
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ��ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#: ../src/empathy-event-manager.c:691
+#: ../src/empathy-event-manager.c:590
 msgid "_Decline"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:595
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "�_��าห�อ�"
 
-#: ../src/empathy-event-manager.c:735
+#: ../src/empathy-event-manager.c:634
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s �����ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "�าร��า��อ����ม���า�า� %s"
 
-#: ../src/empathy-event-manager.c:941
+#: ../src/empathy-event-manager.c:818
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "มี�าร�อสมั�ร�า� %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:822
 #, c-format
 msgid ""
 "\n"
@@ -2668,13 +2676,13 @@ msgstr ""
 "��อ�วาม: %s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:985
+#: ../src/empathy-event-manager.c:862
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ออ��ล���ล�ว"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:1001
+#: ../src/empathy-event-manager.c:878
 #, c-format
 msgid "%s is now online."
 msgstr "%s ออ��ล���ล�ว"
@@ -2818,19 +2826,23 @@ msgstr "�หล����อมูล"
 msgid "%s account"
 msgstr "�ั��ี %s"
 
-#: ../src/empathy-main-window.c:431
+#: ../src/empathy-main-window.c:435
 msgid "Reconnect"
 msgstr "��ื�อม��อ�หม�"
 
-#: ../src/empathy-main-window.c:438
+#: ../src/empathy-main-window.c:442
 msgid "Edit Account"
 msgstr "������ั��ี"
 
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:449
 msgid "Close"
 msgstr "�ิ�"
 
-#: ../src/empathy-main-window.c:1331
+#: ../src/empathy-main-window.c:1036
+msgid "Contact"
+msgstr "�ู��ิ���อ"
+
+#: ../src/empathy-main-window.c:1374
 msgid "Show and edit accounts"
 msgstr "�ส���ละ������ั��ี��า��"
 
@@ -2859,8 +2871,8 @@ msgid "N_ormal Size"
 msgstr "��า�_���ิ"
 
 #: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call..."
-msgstr "_สาย�หม�..."
+msgid "New _Callâ?¦"
+msgstr "_สาย�หม��"
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
@@ -2899,12 +2911,12 @@ msgid "_File Transfers"
 msgstr "�าร_��าย�อ����ม"
 
 #: ../src/empathy-main-window.ui.h:22
-msgid "_Join..."
-msgstr "�_��าห�อ�..."
+msgid "_Joinâ?¦"
+msgstr "�_��าห�อ��"
 
 #: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation..."
-msgstr "�ารส���า�_หม�..."
+msgid "_New Conversationâ?¦"
+msgstr "�ารส���า�_หม��"
 
 #: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
@@ -2926,11 +2938,10 @@ msgstr "ห�อ�ส���า"
 msgid "Members"
 msgstr "สมา�ิ�"
 
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
 #: ../src/empathy-new-chatroom-dialog.c:539
 #, 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"
@@ -3058,10 +3069,6 @@ msgstr "��ิ�����าร�รว��ัวสะ��สำห
 msgid "General"
 msgstr "�ั�ว��"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Location"
-msgstr "�ำ�ห����ี��ั��"
-
 #: ../src/empathy-preferences.ui.h:13
 msgid "Location sources:"
 msgstr "�หล����อมูล�ำ�ห����ี��ั��:"
@@ -3134,8 +3141,8 @@ msgid "_GPS"
 msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wifi)"
-msgstr "�_�รือ��าย (IP, Wifi)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "�_�รือ��าย (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -3149,7 +3156,7 @@ msgstr "_�ระ�าศ�ำ�ห����ี��ั����ย
 msgid "_Reduce location accuracy"
 msgstr "_ล��วามละ�อีย��อ��ำ�ห����ี��ั��"
 
-#: ../src/empathy-status-icon.c:179
+#: ../src/empathy-status-icon.c:175
 msgid "Respond"
 msgstr "�อ�รั�"
 
@@ -3161,18 +3168,6 @@ msgstr "ส�า�ะ"
 msgid "_Quit"
 msgstr "_ออ�"
 
-#: ../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: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 "����ี��ู��ิ���อ"
@@ -3239,6 +3234,82 @@ msgid ""
 "extension."
 msgstr "��รื�อ�มือ�ั��าร�าร��ื�อม��อ�ี��ลือ��ม�รอ�รั�ส�ว��ยายสำหรั��ี�ั��ระยะ��ล"
 
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "��ิ��ู�ร�วมส���า"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "�ลือ��ู��ิ���อ�ี��ะ��ิ����าร�วมส���า:"
+
+#~ msgid "Hidden"
+#~ msgstr "��อ��ัว"
+
+#~ msgid "User requested disconnect"
+#~ msgstr "�ู�����อ�ั��าร��ื�อม��อ"
+
+#~ msgid "What is your Windows Live user name?"
+#~ msgstr "�ื�อ�ู���� Windows Live �อ��ุ��ืออะ�ร?"
+
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>�ำ�ห����ี��ั��</b>"
+
+#~ msgid "Email:"
+#~ msgstr "อี�มล:"
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "�������อ�วาม�ำห���อ�..."
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "��อ�ิ��ลา��ือ: <span style=\"italic\">%s</span>"
+
+#~ msgid "_Next"
+#~ msgstr "_�ั���"
+
+# This is part of "Add new <type> account" message
+#~ msgid "Add new"
+#~ msgstr "สร�า��ั��ี"
+
+#~ msgid "Cr_eate"
+#~ msgstr "_สร�า�"
+
+#~ msgid "_Add..."
+#~ msgstr "�_�ิ�ม..."
+
+#~ msgid "_Import..."
+#~ msgstr "_�ำ���า..."
+
+# This is part of "Add new <type> account" message
+#~ msgid "account"
+#~ msgstr "�หม�"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s ส���ำ��ิ��ึ��ุ�"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "�ะ�รีย���ร��รมภาย�อ���ื�อ�ั��าร�ำ��ิ��ี�"
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "����ุ��ม�มี��ร��รมภาย�อ��ี��ะ�ั��าร�ำ��ิ��ี�"
+
+#~ msgid "New _Call..."
+#~ msgstr "_สาย�หม�..."
+
+#~ msgid "_Join..."
+#~ msgstr "�_��าห�อ�..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "�ารส���า�_หม�..."
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "�ม�สามาร���ิ���ร��รมสำหรั��ริ�าร %s: %s"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr "�ุ����รั��ำ��ิ�สำหรั��ริ�าร %s ����ุ��ม�มี��ร��รม�ี��ะ�ั��าร�ำ��ิ��ี�"
+
 #~ msgid "_Reuse an existing account"
 #~ msgstr "�ำ�ั��ี�ี�มีอยู��ลั�มา�_���หม�"
 
@@ -3393,9 +3464,6 @@ msgstr "��รื�อ�มือ�ั��าร�าร��ื�อ
 #~ msgid "Invitation _message:"
 #~ msgstr "_��อ�วาม��ิ�:"
 
-#~ msgid "Invite"
-#~ msgstr "��ิ�"
-
 #~ msgid "You have been invited to join a chat conference."
 #~ msgstr "�ุ����รั��ำ��ิ��ห����าร�วมส���า��ห�อ��ระ�ุม"