[empathy] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit e958f2457d7c4f9b51422cb10a658cc8a5756a13
Author: Sira Nokyoongtong <gumaraa gmail com>
Date:   Mon Apr 25 14:44:56 2011 +0700

    Updated Thai translation.

 po/th.po | 2317 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1573 insertions(+), 744 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index 8aa9c6c..f7d6f2d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,15 +1,16 @@
 # Thai translation of empathy
-# Copyright (C) 2008-2010 Free Software Foundation, Inc.
+# Copyright (C) 2008-2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
-# Theppitak Karoonboonyanan <thep linux thai net>, 2008-2010.
+# Theppitak Karoonboonyanan <thep linux thai net>, 2008-2011.
+# Sira Nokyoongtong <gumaraa gmail com>, 2011.
 #
 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: 2010-06-04 10:22+0000\n"
-"PO-Revision-Date: 2010-06-04 20:52+0700\n"
+"product=empathy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-04-22 08:27+0000\n"
+"PO-Revision-Date: 2011-04-25 14:31+0700\n"
 "Last-Translator: Sira Nokyoongtong <gumaraa gmail com>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -18,395 +19,401 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+
+#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy: ��ร��รม��อ�วาม�ั���"
 
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
 msgstr "��ร��รมลู���าย��อ�วาม�ั���"
 
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "รั��ละส����อ�วาม"
-
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "��ิ�ห��า��า�ส���า�ย��ั�สำหรั��ารส���า�หม�"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "อั��ระ�ี��ะ��ิ�ม��อ��าย�ื�อ�รีย��มื�อ����าร��ิม�ื�อ�รีย�อั���มั�ิ��วย�ุ�ม������ห�อ�ส���า�ลุ�ม"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "�ุ�������ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "ราย�ื�อ�อ�ภาษา�ี��ะ�รว�สอ��ัวสะ�� (���� \"en, fr, nl\") �ั����วย�ุลภา�"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "ราย�ื�อ�ู��ิ���อ����ระ�ั�"
 
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Connection managers should be used"
 msgstr "�����ร��รม�ั��าร�าร��ื�อม��อ"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Contact list sort criterion"
 msgstr "วิ�ี�รีย�ลำ�ั��ื�อ�ู��ิ���อ"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "���ร��อรี�ริยาย�ี��ะ����ลือ�รู�����ัว"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "�ิ��าร�ุ���อ�วาม�����ห�ุ�มื�อ�ม�อยู�"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "�ิ��าร����สีย��มื�อ�ม�อยู�"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
 msgstr "Empathy สามาร��ระ�าศ�ำ�ห����ี��ั���อ��ู�������"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy สามาร���� GPS ���าร��า�ำ�ห����ี��ั��"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy สามาร������รือ��าย��รศั���มือ�ือ���าร��า�ำ�ห����ี��ั��"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy สามาร������รือ��าย���าร��า�ำ�ห����ี��ั��"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy default download folder"
 msgstr "��ล��อร��าว���หล��ริยาย�อ� Empathy"
 
-#: ../data/empathy.schemas.in.h:16
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี���ล�ว"
-
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy ���ย�าย��อมูล�ูม butterfly �ล�ว"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy �วร��ลี�ย�ส�า�ะ�����ม�อยู���ยอั���มั�ิ�มื�อ��รื�อ��ม��������า�"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy �วร��ื�อม��อ��ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy �วรล��วามละ�อีย��อ��ำ�ห����ี��ั��"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy �วร���รู�����ัว�อ��ู��ิ���อ�����อ�อ��อ�ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable WebKit Developer Tools"
 msgstr "��ิ������รื�อ�มือ�ั��า�อ� WebKit"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable popup notifications for new messages"
 msgstr "��ิ�����าร�ุ���อ�วาม�����ห�ุสำหรั���อ�วาม�หม�"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable spell checker"
 msgstr "��ิ�����าร�รว��ัวสะ��"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide main window"
 msgstr "��อ�ห��า��า�หลั�"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide the main window."
 msgstr "��อ�ห��า��า�หลั�"
 
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported"
-msgstr "����ำ���า�ั��ี MC 4 �ล�ว"
-
-#: ../data/empathy.schemas.in.h:28
-msgid "MC 4 accounts have been imported."
-msgstr "����ำ���า�ั��ี MC 4 ���ล�ว"
-
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Nick completed character"
 msgstr "อั��ระ��ิม��าย�ื�อ�รีย�"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Open new chats in separate windows"
 msgstr "��ิ��ารส���า�หม���ห��า��า��ย�"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Path of the Adium theme to use"
 msgstr "�า��อ��ุ������� Adium �ี��ะ���"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "�า��อ��ุ������� Adium �ี��ะ��� ���ร�ี�ี�����ุ�������สำหรั��ารส���า�อ� Adium"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for incoming messages"
 msgstr "�ล���สีย��มื�อมี��อ�วาม���า"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for new conversations"
 msgstr "�ล���สีย��มื�อมี�ารส���า�หม�"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "�ล���สีย��มื�อส����อ�วามออ�"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs in"
 msgstr "�ล���สีย��มื�อมี�ู��ิ���อ���าสู�ระ��"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs out"
 msgstr "�ล���สีย��มื�อมี�ู��ิ���อออ��า�ระ��"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log in"
 msgstr "�ล���สีย��มื�อ�รา���าสู�ระ��"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log out"
 msgstr "�ล���สีย��มื�อ�ราออ��า�ระ��"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "�ุ���อ�วาม�����ห�ุ��าห��า��า�ส���า�ม�������ัส"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Pop up notifications when a contact logs in"
 msgstr "�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อ���าสู�ระ��"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Pop up notifications when a contact logs out"
 msgstr "�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��า�ระ��"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show avatars"
 msgstr "�ส��รู�����ัว"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show contact list in rooms"
 msgstr "�ส��ราย�ื�อ�ู��ิ���อ��ห�อ���า��"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "�ส���ำ��ะ�ำวิ�ี�ิ�ห��า��า�หลั�"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show offline contacts"
 msgstr "�ส���ู��ิ���อ�ี�ออ��ล��"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show protocols"
 msgstr "�ส����ร���อล"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Spell checking languages"
 msgstr "ภาษา�ี��รว��ัวสะ��"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "��ล��อร��ริยาย�ี��ะ�ั��ึ����ม�ี���าย�อ����ามา"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "���ร��อรีล�าสุ��ี��ู�����ลือ�รู�����ัว"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "The position for the chat window side pane"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "�ุ��������ี��ะ����ส���ารส���า��ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use graphical smileys"
 msgstr "���รู�สีห��า����รา�ิ�ส�"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use notification sounds"
 msgstr "����สีย������ห�ุ"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use theme for chat rooms"
 msgstr "����ุ��������ั�ห�อ�ส���า"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "�ำห��ว�า Empathy สามาร��ระ�าศ�ำ�ห����ี��ั���อ��ู������อ�ู��ิ���อหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "�ำห��ว�า Empathy สามาร���� GPS ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "�ำห��ว�า Empathy สามาร������รือ��าย��รศั���มือ�ือ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "�ำห��ว�า Empathy สามาร������รือ��าย���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:59
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "�ำห��ว�า Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี�า���ร��รมอื�����ล�วหรือยั�"
-
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "�ำห��ว�า Empathy ���ย�าย��อมูล�ูม butterfly ���ล�วหรือยั�"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "�ำห��ว�า�ะ�ห� Empathy ���าระ�����ั��ี�อ��ุ���ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:62
-msgid "Whether Empathy should go into away mode automatically if user is idle."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#, fuzzy
+#| msgid ""
+#| "Whether Empathy should go into away mode automatically if user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "�ำห��ว�า�ะ�ห� Empathy ��ลี�ย�ส�า�ะ�����ม�อยู���ยอั���มั�ิ�มื�อ��รื�อ��ม��������า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "�ำห��ว�า Empathy �วรล��วามละ�อีย��อ��ำ�ห����ี��ั����ื�อ�วาม����ส�ว��ัวหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "�ำห��ว�า�ะ�ห� Empathy ���รู�����ัว�อ��ู��ิ���อ�����อ�อ��อ�ห��า��า�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "�ำห��ว�า�ะ��ิ������รื�อ�มือ�ั��า�อ� WebKit ���� ��รื�อ�มือ���าสั�����ว�� หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
 "�ำห��ว�า�ะ�����ร��รม�ั��าร�าร��ื�อม��อ���าร�ั��าร��ื�อม��อ/��ื�อม��อ�หม���ยอั���มั�ิหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "�ำห��ว�า�ะ�รว��ัวสะ���อ��ำ�ี���อ��ามภาษา�ี��ุ���อ��าร�ะ�รว�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "�ำห��ว�า�ะ��ล���อ�วามรู�สีห��า (smiley) ����ภา��รา�ิ�ส�หรือ�ม���ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อ���าสู�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อออ��า�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of events."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ห�ุ��ี�ยว�ั��ห�ุ�าร����า�� หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ������อ�วาม���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส���า�หม�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส����อ�วามออ�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether to play a sound when logging into a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อ���าสู�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to play a sound when logging out of a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อออ��า�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play sound notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ล���สีย��มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "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:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อ���รั���อ�วาม�หม�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "�ำห��ว�า�ะ�ส��รู�����ัว�อ��ู��ิ���อ��ราย�ื�อ�ู��ิ���อ�ละ��ห��า��า�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "�ำห��ว�า�ะ�ส���ู��ิ���อ�ี�ออ��ล����ราย�ื�อ�ู��ิ���อ��วยหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to show popup notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ุ���อ�วาม�����ห�ุ�มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "�ำห��ว�า�ะ�ส����ร���อล�อ��ู��ิ���อ��ราย�ื�อ�ู��ิ���อหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show the contact list in chat rooms."
 msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ��ห�อ�ส���า��า�� หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show the contact list in compact mode."
 msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ����ระ�ั�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 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:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to use the theme for chat rooms."
 msgstr "�ำห��ว�า�ะ����ุ��������ั�ห�อ�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
 "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 "
@@ -421,148 +428,226 @@ msgstr "�ั��าร�ั��ี��อ�วาม�ั����
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2094 ../src/cc-empathy-accounts-page.c:244
-#: ../src/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2271
 msgid "Messaging and VoIP Accounts"
 msgstr "�ั��ี��อ�วาม�ั����ละ VoIP"
 
-#: ../libempathy/empathy-ft-handler.c:843
-msgid "The hash of the received file and the sent one do not match"
-msgstr "��า�ฮ��อ����ม�ี�รั��ั��อ����ม�ี�ส���ม��ร��ั�"
+#: ../libempathy/empathy-ft-handler.c:825
+#, fuzzy
+#| msgid "File transfer completed"
+msgid "File transfer completed, but the file was corrupted"
+msgstr "��าย�อ����ม�สร��สม�ูร��"
 
-#: ../libempathy/empathy-ft-handler.c:1103
+#: ../libempathy/empathy-ft-handler.c:1113
 msgid "File transfer not supported by remote contact"
 msgstr "�ู��ิ���ออี��ั��ห�ึ���ม�รอ�รั��าร��าย�อ����ม"
 
-#: ../libempathy/empathy-ft-handler.c:1161
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "���ม�ี��ลือ��ม�������ม���ิ"
 
-#: ../libempathy/empathy-ft-handler.c:1170
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "���ม�ี��ลือ�ว�า���ล�า"
 
-#: ../libempathy/empathy-tp-file.c:281
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "�ม�รอ�รั���อ�������ิ��ี�"
 
-#: ../libempathy/empathy-tp-file.c:400
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr "�ม�มี�ารระ�ุสา�ห�ุ"
 
-#: ../libempathy/empathy-tp-file.c:403
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr "มี�ารร�อ��อ�าร��ลี�ย�ส�า�ะ"
 
-#: ../libempathy/empathy-tp-file.c:406
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
 msgstr "�ุ����ย��ลิ��าร��าย�อ����ม"
 
-#: ../libempathy/empathy-tp-file.c:409
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
 msgstr "อี���ายห�ึ�����ย��ลิ��าร��าย�อ����ม"
 
-#: ../libempathy/empathy-tp-file.c:412
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
 msgstr "��ิ���อ�ิ��ลา���ะ�ยายาม��าย�อ����ม"
 
-#: ../libempathy/empathy-tp-file.c:415
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
 msgstr "อี���ายห�ึ���ม�สามาร���าย�อ����ม���"
 
-#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
 msgid "Unknown reason"
 msgstr "�ม��รา�สา�ห�ุ"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:304
 msgid "Available"
 msgstr "อยู�"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:306
 msgid "Busy"
 msgstr "�ม�ว�า�"
 
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:309
 msgid "Away"
 msgstr "�ม�อยู�"
 
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:311
 msgid "Invisible"
 msgstr "��อ��ัว"
 
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:313
 msgid "Offline"
 msgstr "ออ��ล��"
 
-#: ../libempathy/empathy-utils.c:249
+#. translators: presence type is unknown
+#. translators: encoding video codec is unknown
+#. translators: encoding audio codec is unknown
+#. translators: decoding video codec is unknown
+#. translators: decoding audio codec is unknown
+#: ../libempathy/empathy-utils.c:316
+#: ../src/empathy-streamed-media-window.c:1905
+#: ../src/empathy-streamed-media-window.c:1907
+#: ../src/empathy-streamed-media-window.c:1909
+#: ../src/empathy-streamed-media-window.c:1911
+#: ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "�ม��รา�"
 
-#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:355
 msgid "No reason specified"
 msgstr "�ม�มี�ารระ�ุสา�ห�ุ"
 
-#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
 msgid "Status is set to offline"
 msgstr "ส�า�ะ��ลี�ย�����ออ��ล��"
 
-#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
 msgid "Network error"
 msgstr "��อ�ิ��ลา���ี�ยว�ั���รือ��าย"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
 msgid "Authentication failed"
 msgstr "�ารยื�ยั��ัว�ุ��ล�ม���า�"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
 msgid "Encryption error"
 msgstr "��อ�ิ��ลา���ี�ยว�ั��าร���ารหัสลั�"
 
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:365
 msgid "Name in use"
 msgstr "�ื�อ�ู����อยู�"
 
-#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
 msgid "Certificate not provided"
 msgstr "�ม�มี��รั�รอ�"
 
-#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
 msgid "Certificate untrusted"
 msgstr "�ม���ื�อ�ือ��รั�รอ�"
 
-#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
 msgid "Certificate expired"
 msgstr "��รั�รอ�หม�อายุ�ล�ว"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
 msgid "Certificate not activated"
 msgstr "��รั�รอ�ยั��ม�มี�าร�ริ�ม���"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
 msgid "Certificate hostname mismatch"
 msgstr "�ื�อ�ฮส������รั�รอ��ม��ร��ั�"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
 msgid "Certificate fingerprint mismatch"
 msgstr "ลาย�ิ�วมือ����รั�รอ��ม��ร��ั�"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
 msgid "Certificate self-signed"
 msgstr "��รั�รอ�����รั�รอ��ัว�อ�"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:381
 msgid "Certificate error"
 msgstr "��อ�ิ��ลา���ี�ยว�ั���รั�รอ�"
 
-#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:106
+#: ../libempathy/empathy-utils.c:415
+msgid "Encryption is not available"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:417
+msgid "Certificate is invalid"
+msgstr "��รั�รอ��ม��ู���อ�"
+
+#: ../libempathy/empathy-utils.c:419
+#, fuzzy
+#| msgid "Connection managers should be used"
+msgid "Connection has been refused"
+msgstr "�����ร��รม�ั��าร�าร��ื�อม��อ"
+
+#: ../libempathy/empathy-utils.c:421
+#, fuzzy
+#| msgid "Connection managers should be used"
+msgid "Connection can't be established"
+msgstr "�����ร��รม�ั��าร�าร��ื�อม��อ"
+
+#: ../libempathy/empathy-utils.c:423
+#, fuzzy
+#| msgid "Connection managers should be used"
+msgid "Connection has been lost"
+msgstr "�����ร��รม�ั��าร�าร��ื�อม��อ"
+
+#: ../libempathy/empathy-utils.c:425
+#, fuzzy
+#| msgid "This account already exists on the server"
+msgid "This resource is already connected to the server"
+msgstr "�ั��ี�ี�มีอยู��ล�ว�ี���ิร���วอร�"
+
+#: ../libempathy/empathy-utils.c:427
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:430
+msgid "The account already exists on the server"
+msgstr "�ั��ี�ี�มีอยู��ล�ว�ี���ิร���วอร�"
+
+#: ../libempathy/empathy-utils.c:432
+msgid "Server is currently too busy to handle the connection"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:434
+#, fuzzy
+#| msgid "Certificate not provided"
+msgid "Certificate has been revoked"
+msgstr "�ม�มี��รั�รอ�"
+
+#: ../libempathy/empathy-utils.c:436
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:439
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:602
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "�ู�����ว�ี�"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:607
 msgid "Yahoo! Japan"
 msgstr "Yahoo! �ี��ุ��"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:636
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:637
 msgid "Facebook Chat"
 msgstr "�ารส���า Facebook"
 
@@ -606,62 +691,112 @@ msgstr[0] "%d ��ือ���อ�"
 msgid "in the future"
 msgstr "��อ�า��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:491
 msgid "All"
 msgstr "�ั��หม�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../src/empathy-import-widget.c:321
+msgid "Account"
+msgstr "�ั��ี"
+
+#: ../libempathy-gtk/empathy-account-widget.c:683
+msgid "Password"
+msgstr "รหัส��า�"
+
+#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "��ิร���วอร�"
+
+#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "�อร��"
+
+#: ../libempathy-gtk/empathy-account-widget.c:757
+#: ../libempathy-gtk/empathy-account-widget.c:814
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../libempathy-gtk/empathy-account-widget.c:1166
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1172
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+#, fuzzy
+#| msgid "Empathy Accounts"
+msgid "Launch My Web Accounts"
+msgstr "�ั��ี Empathy"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1530
 msgid "Username:"
 msgstr "�ื�อ�ู����:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1479
+#: ../libempathy-gtk/empathy-account-widget.c:1897
+msgid "A_pply"
+msgstr "�_ริ�ม���"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1927
 msgid "L_og in"
 msgstr "�_��าระ��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1547
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1993
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
 #: ../libempathy-gtk/empathy-contact-selector-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.c:1558
-msgid "Enabled"
-msgstr "��ิ����"
+#. translators: this is the label of a checkbox used to enable/disable IM
+#. * accounts
+#: ../libempathy-gtk/empathy-account-widget.c:2006
+msgid "_Enabled"
+msgstr "�_�ิ����"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:2071
 msgid "This account already exists on the server"
 msgstr "�ั��ี�ี�มีอยู��ล�ว�ี���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:2074
 msgid "Create a new account on the server"
 msgstr "สร�า��ั��ี�หม��ี���ิร���วอร�"
 
+#: ../libempathy-gtk/empathy-account-widget.c:2266
+msgid "Ca_ncel"
+msgstr "ย_��ลิ�"
+
 #. 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".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
 #. * 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:1995
+#: ../libempathy-gtk/empathy-account-widget.c:2563
 #, 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:2021
+#: ../libempathy-gtk/empathy-account-widget.c:2589
 #, c-format
 msgid "%s Account"
 msgstr "�ั��ี %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2593
 msgid "New account"
 msgstr "�ั��ี�หม�"
 
@@ -683,41 +818,61 @@ 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-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_รหัส��า�:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Remember Password"
+msgstr "�ำรหัส��า�"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "�ำรหัส��า�"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "_�ื�อ�รีย�:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "รหัส��า� AIM �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "_�อร��:"
 
-#: ../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:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "��ิร���_วอร�:"
@@ -728,16 +883,16 @@ 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "_�ื�อ���าระ��:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "�ื�อ�ู���� GroupWise �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "รหัส��า� GroupWise �อ��ุ��ืออะ�ร?"
 
@@ -746,26 +901,22 @@ msgid "<b>Example:</b> 123456789"
 msgstr "<b>�ัวอย�า�:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "ร_หัสอั��ระ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "_UIN �อ� ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "UIN �อ� ICQ �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 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 "_Character set:"
-msgstr "รหัส_อั��ระ:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
-msgid "New Network"
-msgstr "��รือ��าย�หม�"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.c:183
 #: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "Auto"
@@ -831,6 +982,14 @@ msgstr "�ื�อ�ริ�:"
 msgid "Servers"
 msgstr "��ิร���วอร�"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "�ื�อ�รีย��� IRC �อ��ุ��ืออะ�ร?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "IRC ��รือ��าย�ห�?"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
 msgid "<b>Example:</b> user gmail com"
 msgstr "<b>�ัวอย�า�:</b> user gmail com"
@@ -839,20 +998,28 @@ msgstr "<b>�ัวอย�า�:</b> user gmail com"
 msgid "<b>Example:</b> user jabber org"
 msgstr "<b>�ัวอย�า�:</b> user jabber org"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "��อ����ารหัส_ลั� (TLS/SSL)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "�_ม�ส�����อ�ิ��ลา��อ���รั�รอ� SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
 msgstr "�ำห����า�ั���า�อ���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
 msgstr "ลำ�ั��วาม_สำ�ั�:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "�ห_ล����อมูล:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -864,82 +1031,74 @@ msgstr ""
 "�ุ�สามาร���� <a href=\"http://www.facebook.com/username/\";>ห��า�ี�</a> "
 "��ื�อสร�า��ื�อ�ู���� Facebook �����ายั��ม�มี"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "��� SSL ����_��า"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "รหัส��า� Facebook �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "�ื�อ�ู���� Facebook �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "�ื�อ�ู���� Google �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "รหัส��า� Google �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "�ื�อ�ู���� Jabber �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "รหัส��า� Jabber �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "�ุ���อ��าร����ื�ออะ�รสำหรั� Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "�ุ���อ��าร���รหัส��า�อะ�รสำหรั� Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "��อ����ารหัส_ลั� (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "�_ม�ส�����อ�ิ��ลา��อ���รั�รอ� SSL"
-
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>�ัวอย�า�:</b> user hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "ID สำหรั� Windows Live �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "รหัส��า�สำหรั� Windows Live �อ��ุ��ืออะ�ร?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "�ี�อยู�_อี�มล:"
+msgid "E-_mail address:"
+msgstr "�ี�อยู�อี�_มล:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "�ื�_อ�รีย�:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "_�ื�อ:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "�ั��ี _Jabber:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "_�ามส�ุล:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "�ื�อ�_รีย�:"
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "�ื�อ�ี�_�ระ�าศ:"
@@ -992,136 +1151,130 @@ msgstr "�อร��:"
 msgid "Proxy Options"
 msgstr "�ัว�ลือ�สำหรั��ร�อ��ี"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "STUN Server:"
 msgstr "��ิร���วอร� STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Server:"
 msgstr "��ิร���วอร�:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Transport:"
 msgstr "�ารรั�ส����อมูล:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "What is your SIP account password?"
 msgstr "รหัส��า��ั��ี SIP �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "What is your SIP login ID?"
 msgstr "�ื�อ�ั��ี SIP �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "_Username:"
 msgstr "_�ื�อ�ู����:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "��� Yahoo! �ี��ุ�_�"
+msgid "I_gnore conference and chat room invitations"
+msgstr "�_ม�ส����าร��ิ����าห�อ��ระ�ุม�ละห�อ�ส���า"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "�ื�อ�ั��ี Yahoo! �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "รหัส��า� Yahoo! �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "_�ั��ี Yahoo!:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "�_ม�ส����าร��ิ����าห�อ��ระ�ุม�ละห�อ�ส���า"
-
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "�ล��ล�อ�ราย�ื�อ_ห�อ�:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
 msgid "Couldn't convert image"
 msgstr "�ม�สามาร���ล�รู�ภา����"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ระ���อ��ุ��ม�รอ�รั��อร��ม�รู�ภา���� �ี���ร��รมยอมรั��ลย"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:928
+#: ../libempathy-gtk/empathy-avatar-chooser.c:930
 msgid "Select Your Avatar Image"
 msgstr "�ลือ�รู�����ัว�อ��ุ�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:931
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "No Image"
 msgstr "�ม�มีรู�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:993
+#: ../libempathy-gtk/empathy-avatar-chooser.c:995
 msgid "Images"
 msgstr "รู�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:997
+#: ../libempathy-gtk/empathy-avatar-chooser.c:999
 msgid "All Files"
 msgstr "�ุ����ม"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "�ลิ���ื�อ�ยาย"
 
-#: ../libempathy-gtk/empathy-chat.c:249
-msgid "Failed to reconnect this chat"
-msgstr "��ื�อม��อ�ารส���า�ี���ำ�ม�สำ�ร��"
-
-#: ../libempathy-gtk/empathy-chat.c:671
-msgid "Failed to join chat room"
-msgstr "���าห�อ�ส���า�ม�สำ�ร��"
-
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:652
 msgid "Failed to open private chat"
 msgstr "��ิ��ารส���าส�ว��ัว�ม�สำ�ร��"
 
-#: ../libempathy-gtk/empathy-chat.c:728
+#: ../libempathy-gtk/empathy-chat.c:717
 msgid "Topic not supported on this conversation"
 msgstr "�ม�รอ�รั��าร�ั��หัว��อ���ารส���า�ี�"
 
-#: ../libempathy-gtk/empathy-chat.c:734
+#: ../libempathy-gtk/empathy-chat.c:723
 msgid "You are not allowed to change the topic"
 msgstr "�ุ��ม����รั�อ�ุ�า��ห���ลี�ย�หัว��อ���"
 
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:930
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ล�า���อ�วาม�ั��หม�ออ��า��ารส���า�ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:933
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <หัว��อ>: �ั��หัว��อ�อ��ารส���า�ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:936
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�ื�อห�อ�ส���า>: ���าห�อ�ส���าห�อ��หม�"
 
-#: ../libempathy-gtk/empathy-chat.c:874
+#: ../libempathy-gtk/empathy-chat.c:939
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�ื�อห�อ�ส���า>: ���าห�อ�ส���าห�อ��หม�"
 
-#: ../libempathy-gtk/empathy-chat.c:877
+#: ../libempathy-gtk/empathy-chat.c:944
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:949
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�ื�อ�ู��ิ���อ> [<��อ�วาม>]: ��ิ��ารส���าส�ว��ัว"
 
-#: ../libempathy-gtk/empathy-chat.c:880
+#: ../libempathy-gtk/empathy-chat.c:952
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�ื�อ�ู��ิ���อ> <��อ�วาม>: ��ิ��ารส���าส�ว��ัว"
 
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:955
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <�ื�อ�ล��>: ��ลี�ย��ื�อ�ล���อ��ุ�����ิร���วอร��ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:958
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <��อ�วาม>: ส����อ�วาม ACTION (�าร�ระ�ำ���ั��ุ�ั�) ���า�����ารส���า�ั��ุ�ั�"
 
-#: ../libempathy-gtk/empathy-chat.c:889
+#: ../libempathy-gtk/empathy-chat.c:961
 msgid ""
 "/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 "
@@ -1130,90 +1283,104 @@ msgstr ""
 "/say <��อ�วาม>: ส�� <��อ�วาม> ���า�����ารส���า�ั��ุ�ั� ���สำหรั�ส����อ�วาม�ี��ึ�������วย '/' "
 "�ัวอย�า����� \"/say /join ���สำหรั����าห�อ�ส���าห�อ��หม�\""
 
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:966
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<�ำสั��>]: �ส���ำสั���ั��หม��ี�รอ�รั� ��าระ�ุ <�ำสั��> ��วย ���ะ�ส��วิ�ี����ำสั���ั��"
 
-#: ../libempathy-gtk/empathy-chat.c:904
+#: ../libempathy-gtk/empathy-chat.c:976
 #, c-format
 msgid "Usage: %s"
 msgstr "วิ�ี���: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:933
+#: ../libempathy-gtk/empathy-chat.c:1015
 msgid "Unknown command"
 msgstr "�ม�รู��ั��ำสั���ี�"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1141
 msgid "Unknown command; see /help for the available commands"
 msgstr "�ม�รู��ั��ำสั���ี� �ู�ำสั���ี�����������า� /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1278
 msgid "offline"
 msgstr "ออ��ล��"
 
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1281
 msgid "invalid contact"
 msgstr "��อมูล�ู��ิ���อ�ิ��ลา�"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1284
 msgid "permission denied"
 msgstr "�ม����รั�อ�ุ�า�"
 
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "too long message"
 msgstr "��อ�วามยาว��ิ���"
 
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1290
 msgid "not implemented"
 msgstr "ยั��ม��ำ"
 
-#: ../libempathy-gtk/empathy-chat.c:1207
+#: ../libempathy-gtk/empathy-chat.c:1294
 msgid "unknown"
 msgstr "�ม��รา�"
 
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1298
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะส����อ�วาม '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1321 ../src/empathy-chat-window.c:688
+#: ../libempathy-gtk/empathy-chat.c:1359 ../src/empathy-chat-window.c:717
 msgid "Topic:"
 msgstr "หัว��อ:"
 
-#: ../libempathy-gtk/empathy-chat.c:1333
+#: ../libempathy-gtk/empathy-chat.c:1371
 #, c-format
 msgid "Topic set to: %s"
 msgstr "หัว��อ�ู��ั������: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335
+#: ../libempathy-gtk/empathy-chat.c:1373
 msgid "No topic defined"
 msgstr "�ม�มี�าร�ำห��หัว��อ"
 
-#: ../libempathy-gtk/empathy-chat.c:1811
+#: ../libempathy-gtk/empathy-chat.c:1872
 msgid "(No Suggestions)"
 msgstr "(�ม�มี�ำ��ะ�ำ)"
 
-#: ../libempathy-gtk/empathy-chat.c:1865
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1940
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "��ิ�ม '%s' ���า�����า�ุ�รม"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1977
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "��ิ�ม '%s' ���า�����า�ุ�รม %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2034
 msgid "Insert Smiley"
 msgstr "��ร�รู�สีห��า"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1883
-#: ../libempathy-gtk/empathy-ui-utils.c:1619
+#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-ui-utils.c:1808
 msgid "_Send"
 msgstr "_ส��"
 
-#: ../libempathy-gtk/empathy-chat.c:1917
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2087
 msgid "_Spelling Suggestions"
 msgstr "�_�ะ�ำ�ัวสะ��"
 
-#: ../libempathy-gtk/empathy-chat.c:2011
+#: ../libempathy-gtk/empathy-chat.c:2176
 msgid "Failed to retrieve recent logs"
 msgstr "�ึ��ูมล�าสุ��ม�สำ�ร��"
 
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2287
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s �ั��าร��ื�อม��อ�ล�ว"
@@ -1221,12 +1388,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:2149
+#: ../libempathy-gtk/empathy-chat.c:2294
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s �ู� %2$s ��ะออ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2297
 #, c-format
 msgid "%s was kicked"
 msgstr "%s �ู���ะออ�"
@@ -1234,17 +1401,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:2160
+#: ../libempathy-gtk/empathy-chat.c:2305
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s �ู� %2$s ห�าม�ม��ห����า"
 
-#: ../libempathy-gtk/empathy-chat.c:2163
+#: ../libempathy-gtk/empathy-chat.c:2308
 #, c-format
 msgid "%s was banned"
 msgstr "%s �ู�ห�าม�ม��ห����า"
 
-#: ../libempathy-gtk/empathy-chat.c:2167
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ออ��า�ห�อ�"
@@ -1254,80 +1421,145 @@ msgstr "%s ออ��า�ห�อ�"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2321
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2201
+#: ../libempathy-gtk/empathy-chat.c:2346
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ���ามา��ห�อ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2226
+#: ../libempathy-gtk/empathy-chat.c:2371
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��ลี�ย��ื�อ���� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2365 ../src/empathy-call-window.c:1649
+#: ../libempathy-gtk/empathy-chat.c:2510
+#: ../src/empathy-streamed-media-window.c:1953
+#: ../src/empathy-event-manager.c:1126
 msgid "Disconnected"
 msgstr "�ั��าร��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:3004
-msgid "Wrong password; please try again:"
-msgstr "รหัส��า��ม��ู���อ� �รุ�าลอ��หม�:"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3140
+msgid "Would you like to store this password?"
+msgstr "�ุ���อ��าร�ห��ำรหัส��า��ี��ว�หรือ�ม�?"
+
+#: ../libempathy-gtk/empathy-chat.c:3146
+msgid "Remember"
+msgstr "�ำรหัส��า�"
 
-#: ../libempathy-gtk/empathy-chat.c:3005
+#: ../libempathy-gtk/empathy-chat.c:3156
+msgid "Not now"
+msgstr "�ม�����อ��ี�"
+
+#: ../libempathy-gtk/empathy-chat.c:3200
 msgid "Retry"
 msgstr "ลอ��หม�"
 
-#: ../libempathy-gtk/empathy-chat.c:3010
+#: ../libempathy-gtk/empathy-chat.c:3204
+msgid "Wrong password; please try again:"
+msgstr "รหัส��า��ม��ู���อ� �รุ�าลอ��หม�:"
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3321
 msgid "This room is protected by a password:"
 msgstr "ห�อ��ี����รหัส��า���อ��ั��ว�:"
 
-#: ../libempathy-gtk/empathy-chat.c:3011
+#: ../libempathy-gtk/empathy-chat.c:3348
 msgid "Join"
 msgstr "���าห�อ�"
 
-#: ../libempathy-gtk/empathy-chat.c:3151
+#: ../libempathy-gtk/empathy-chat.c:3518 ../src/empathy-event-manager.c:1147
 msgid "Connected"
 msgstr "��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:3204
-#: ../libempathy-gtk/empathy-log-window.c:710
+#: ../libempathy-gtk/empathy-chat.c:3571
+#: ../libempathy-gtk/empathy-log-window.c:650
 msgid "Conversation"
 msgstr "�ารส���า"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+msgid "Unknown or invalid identifier"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Contact blocking temporarily unavailable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking unavailable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Permission Denied"
+msgstr "�ม����รั�อ�ุ�า�"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+msgid "Could not block contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+msgid "Edit Blocked Contacts"
+msgstr ""
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:787
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
 msgid "_Copy Link Address"
 msgstr "_�ั�ลอ��ี�อยู�ลิ���"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
 msgid "_Open Link"
 msgstr "_��ิ�ลิ���"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Ey"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "�������อมูล�ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "��อมูลส�ว��ุ��ล"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "�ู��ิ���อ�หม�"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] ""
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "�ั�สิ���ภายห_ลั�"
@@ -1336,214 +1568,315 @@ msgstr "�ั�สิ���ภายห_ลั�"
 msgid "Subscription Request"
 msgstr "�อสมั�ร"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1628
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "����ร�"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1987
+#: ../libempathy-gtk/empathy-individual-view.c:2343
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ยื�ยั��ี��ะล��ลุ�ม '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1630
+#: ../libempathy-gtk/empathy-contact-list-view.c:1989
+#: ../libempathy-gtk/empathy-individual-view.c:2346
 msgid "Removing group"
 msgstr "�ำลั��ะล��ลุ�ม"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1679
-#: ../libempathy-gtk/empathy-contact-list-view.c:1756
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2038
+#: ../libempathy-gtk/empathy-contact-list-view.c:2115
+#: ../libempathy-gtk/empathy-individual-view.c:2401
+#: ../libempathy-gtk/empathy-individual-view.c:2594
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "_ล�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1709
+#: ../libempathy-gtk/empathy-contact-list-view.c:2068
+#: ../libempathy-gtk/empathy-individual-view.c:2465
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ยื�ยั��ี��ะล��ู��ิ���อ '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1711
+#: ../libempathy-gtk/empathy-contact-list-view.c:2070
+#: ../libempathy-gtk/empathy-individual-view.c:2486
 msgid "Removing contact"
 msgstr "�ำลั��ะล��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:209
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:219
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "�_�ิ�ม�ู��ิ���อ�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+#, fuzzy
+#| msgid "Contact"
+msgid "_Block Contact"
+msgstr "�ู��ิ���อ"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:328
+#: ../libempathy-gtk/empathy-individual-menu.c:517
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "_ส���า"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:268
+#: ../libempathy-gtk/empathy-contact-menu.c:359
+#: ../libempathy-gtk/empathy-individual-menu.c:560
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "�รีย�สาย�ุย��วย�สีย_�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-menu.c:390
+#: ../libempathy-gtk/empathy-individual-menu.c:602
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "�รีย�สาย�ุย��วย_ภา��ละ�สีย�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:351
+#: ../libempathy-gtk/empathy-contact-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:645
 #: ../src/empathy-main-window.ui.h:26
 msgid "_Previous Conversations"
 msgstr "�ารส���า��อ�ห_��า�ี�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:373
+#: ../libempathy-gtk/empathy-contact-menu.c:458
+#: ../libempathy-gtk/empathy-individual-menu.c:686
 msgid "Send File"
 msgstr "ส�����ม"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:396
+#: ../libempathy-gtk/empathy-contact-menu.c:481
+#: ../libempathy-gtk/empathy-individual-menu.c:728
 msgid "Share My Desktop"
 msgstr "��ิ��ื�����ะ�ห����ร�วม"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-contact-widget.c:1430
+#: ../libempathy-gtk/empathy-contact-menu.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:1763
+#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "����ร�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:466
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:791
 msgid "Infor_mation"
 msgstr "_��อมูล"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:512
+#: ../libempathy-gtk/empathy-contact-menu.c:596
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "�_����"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:566
-#: ../src/empathy-chat-window.c:899
+#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:935
 msgid "Inviting you to this room"
 msgstr "��ิ��ุ����าห�อ��ี�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:597
+#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
 msgid "_Invite to Chat Room"
 msgstr "�_�ิ����าห�อ�ส���า"
 
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+msgid "Search contacts"
+msgstr "���หา�ู��ิ���อ"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+msgid "Search: "
+msgstr "���หา:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+msgid "_Add Contact"
+msgstr "�_�ิ�ม�ู��ิ���อ"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+msgid "No contacts found"
+msgstr "�ม����ู��ิ���อ"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "�ลือ��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:237
-msgid "Select"
-msgstr "�ลือ�"
+#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-individual-widget.c:153
+msgid "Full name:"
+msgstr "�ื�อ���ม:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:246
-#: ../src/empathy-main-window.c:1130
-msgid "Group"
-msgstr "�ลุ�ม"
+#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-individual-widget.c:154
+msgid "Phone number:"
+msgstr "หมาย�ล���รศั���:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-individual-widget.c:155
+msgid "E-mail address:"
+msgstr "�ี�อยู�อี�มล:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-individual-widget.c:156
+msgid "Website:"
+msgstr "�ว������:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-individual-widget.c:157
+msgid "Birthday:"
+msgstr "วั���ิ�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Country ISO Code:"
 msgstr "รหัส ISO �อ��ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Country:"
 msgstr "�ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "State:"
 msgstr "รั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "City:"
 msgstr "�มือ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Area:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Postal Code:"
 msgstr "รหัส��รษ�ีย�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Street:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:502
 msgid "Building:"
 msgstr "อา�าร:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:504
 msgid "Floor:"
 msgstr "�ั��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:506
 msgid "Room:"
 msgstr "ห�อ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:508
 msgid "Text:"
 msgstr "��อ�วาม:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:510
 msgid "Description:"
 msgstr "�ำ�รรยาย:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:512
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:514
 msgid "Accuracy Level:"
 msgstr "ระ�ั��วามละ�อีย�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:516
 msgid "Error:"
 msgstr "�วาม�ลา���ลื�อ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:518
 msgid "Vertical Error (meters):"
 msgstr "�วาม�ลา���ลื�อ���ว�ั�� (�ม�ร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:520
 msgid "Horizontal Error (meters):"
 msgstr "�วาม�ลา���ลื�อ���ว�อ� (�ม�ร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:522
 msgid "Speed:"
 msgstr "อั�รา�ร�ว:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:524
 msgid "Bearing:"
 msgstr "�ิศ�า�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-individual-widget.c:526
 msgid "Climb Speed:"
 msgstr "อั�รา�ร�ว���ระ�ั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-individual-widget.c:528
 msgid "Last Updated on:"
 msgstr "�รั���อมูลล�าสุ��มื�อ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-individual-widget.c:530
 msgid "Longitude:"
 msgstr "ลอ��ิ�ู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-individual-widget.c:532
 msgid "Latitude:"
 msgstr "ละ�ิ�ู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-individual-widget.c:534
 msgid "Altitude:"
 msgstr "ระ�ั��วามสู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../src/empathy-preferences.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:888
+#: ../libempathy-gtk/empathy-individual-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "�ำ�ห����ี��ั��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-msgid "<b>Location</b>, "
-msgstr "<b>�ำ�ห����ี��ั��</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:890
+#: ../libempathy-gtk/empathy-individual-widget.c:635
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-contact-widget.c:942
+#: ../libempathy-gtk/empathy-individual-widget.c:684
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Ey �วลา %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:735
+#: ../libempathy-gtk/empathy-contact-widget.c:1024
+#: ../libempathy-gtk/empathy-individual-widget.c:919
 msgid "Save Avatar"
 msgstr "�ั��ึ�รู�����ัว"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:1080
+#: ../libempathy-gtk/empathy-individual-widget.c:977
 msgid "Unable to save avatar"
 msgstr "�ม�สามาร��ั��ึ�รู�����ัว"
 
@@ -1551,52 +1884,50 @@ msgstr "�ม�สามาร��ั��ึ�รู�����ัว
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>�ำ�ห����ี��ั��</b> �มื�อ (วั�-�วลา)\t"
 
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
 msgid "Alias:"
 msgstr "�าม���:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "วั���ิ�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
 msgstr "��อมูล��ร��รมลู���าย"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "��ร��รมลู���าย:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
 msgstr "รายละ�อีย��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "�ี�อยู�อี�มล:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "�ื�อ���ม:"
-
-#: ../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:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
 msgid "Identifier:"
 msgstr "�ื�อ�ระ�ำ�ัว:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Information requestedâ?¦"
 msgstr "ร�อ��อ��อมูล���ล�ว�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "รุ��:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "�ลุ�ม"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1604,56 +1935,202 @@ msgstr ""
 "�ลือ��ลุ�ม�ี���อ��าร�ั��ห��ู��ิ���อ�ี�อยู� สั����ว�า�ุ�สามาร��ลือ����มา��ว�าห�ึ���ลุ�ม "
 "หรือ�ะ�ม��ลือ��ลุ�ม�ลย�����"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "รุ��:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "�ว������:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "�_�ิ�ม�ลุ�ม"
 
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "�ลือ�"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1436
+msgid "Group"
+msgstr "�ลุ�ม"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#, fuzzy
+#| msgid "_Offline Contacts"
+msgid "Linked Contacts"
+msgstr "�ู��ิ���อ�ี�_ออ��ล��"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+#, fuzzy
+#| msgid "Select a contact"
+msgid "Select contacts to link"
+msgstr "�ลือ��ู��ิ���อ"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+#, fuzzy
+#| msgid "New Contact"
+msgid "New contact preview"
+msgstr "�ู��ิ���อ�หม�"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr ""
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo jabber org) and the second is one
+#. * of the user's account IDs (e.g. me hotmail com).
+#: ../libempathy-gtk/empathy-individual-menu.c:131
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:839
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "�_����"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:865
+#, fuzzy
+#| msgid "_Add Contactâ?¦"
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contactsâ?¦"
+msgstr "�_�ิ�ม�ู��ิ���อ�"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2308
+msgid "Delete and _Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] ""
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+#, fuzzy
+#| msgid "<b>Location</b> at (date)\t"
+msgid "<b>Location</b> at (date)"
+msgstr "<b>�ำ�ห����ี��ั��</b> �มื�อ (วั�-�วลา)\t"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "ออ��ล���า���รศั���หรืออุ��ร����ลื�อ��ี�"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+msgid "New Network"
+msgstr "��รือ��าย�หม�"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+msgid "Choose an IRC network"
+msgstr "�ลือ���รือ��าย IRC"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "�ลือ�"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "��ิร���วอร��หม�"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "��ิร���วอร�"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "�อร��"
-
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:703
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "�ั��ี"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Linkâ?¦"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr "��ื�อม�ย��ู��ิ���อ"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlinkâ?¦"
+msgstr "_�ั��าร��ื�อม�ย��"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "�ย��ู��ิ���อ�ี���ื�อม�ย��ั��ี��ส��อยู�ออ������ู��ิ���อ���ละราย�ย��ั�"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "�_�ื�อม�ย�"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink linked contacts '%s'?"
+msgstr "�ะ�ั��าร��ื�อม�ย��อ��ู��ิ���อ '%s' �ี���ื�อม�ย��ั�อยู�หรือ�ม�?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
+msgstr ""
+"ยื�ยั�หรือ�ม�ว�า�ุ���อ��าร�ั��าร��ื�อม�ย��อ��ู��ิ���อ�หล�า�ี��ี���ื�อม�ย��ั�อยู�? "
+"�าร�ั��ี��ะ�����าร�ย��ู��ิ���อ�ี���ื�อม�ย��ั�อยู�ออ������ู��ิ���อ���ละราย�ย��ั�"
 
-#: ../libempathy-gtk/empathy-log-window.c:720
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_�ั��าร��ื�อม�ย�"
+
+#: ../libempathy-gtk/empathy-log-window.c:660
 msgid "Date"
 msgstr "วั��ี�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Conversations"
 msgstr "�ารส���า"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#, fuzzy
+#| msgid "Video Preview"
+msgid "Find Previous"
+msgstr "�ส���ัวอย�า�วี�ิ�ัศ��"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Previous Conversations"
 msgstr "�ารส���า��อ�ห��า�ี�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
 msgid "Search"
 msgstr "���หา"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "_For:"
 msgstr "_�ำว�า:"
 
@@ -1662,117 +2139,132 @@ msgid "Contact ID:"
 msgstr "�ื�อ�ระ�ำ�ัว�ู��ิ���อ:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
 msgid "C_hat"
 msgstr "_ส���า"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
 msgid "New Conversation"
 msgstr "�ารส���า�หม�"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:184
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
 msgid "Send _Video"
 msgstr "ส��ภา�_วี�ิ�ัศ��"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:192
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+msgid "C_all"
 msgstr "�_รีย�สาย"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
 msgid "New Call"
 msgstr "�าร�รีย�สาย�หม�"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
 msgid "Custom Messageâ?¦"
 msgstr "��อ�วาม�ำห���อ��"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
 #: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 msgid "Edit Custom Messagesâ?¦"
 msgstr "�������อ�วาม�ำห���อ��"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
 msgid "Click to remove this status as a favorite"
 msgstr "�ลิ���ื�อล�ส�า�ะ�ี�ออ��า�ส�า�ะ��ร�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
 msgid "Click to make this status a favorite"
 msgstr "�ลิ���ื�อ�ำ�ห�ส�า�ะ�ี�����ส�า�ะ��ร�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
 msgid "Set status"
 msgstr "�ำห��ส�า�ะ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:946
 msgid "Set your presence and current status"
 msgstr "�ำห��ส�า�ะอยู�/�ม�อยู��อ��ุ� �ละส�า�ะ�ั��ุ�ั�"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1134
 msgid "Custom messagesâ?¦"
 msgstr "��อ�วาม�ำห���อ��"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "�ั��ี %s �หม�"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Find:"
 msgstr "หา:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "Match case"
 msgstr "�ัว�ิม���ห��-�ล���ร��ั�"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
 msgstr "หา�ม���"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "���รั���อ�วาม�ั���"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "ส����อ�วาม�ั���"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "�าร�อส���า��วย"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "��ื�อม��อ�ั��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "�ั��าร��ื�อม��อ�ั��ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "��ื�อม��อ�ั���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "�ั��าร��ื�อม��อ�ั���ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "�าร�รีย����า��ื�อส���า��วย�สีย�"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "�าร�รีย�สายออ���ื�อส���า��วย�สีย�"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "���ารส���า��วย�สีย�"
 
@@ -1785,12 +2277,12 @@ msgid "Edit Custom Messages"
 msgstr "�������อ�วาม�ำห���อ�"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "�_�ิ�ม��อ�วาม�ำห��ล�ว�ห��าอั��หม�"
+msgid "Save _New Status Message"
+msgstr "�ึ��ึ���อ�วามส�า�ะ�_หม�"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "��อ�วาม�ำห��ล�ว�ห��า�ี��ั��ึ��ว�"
+msgid "Saved Status Messages"
+msgstr "��อ�วามส�า�ะ�ี��ั��ึ��ว�"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -1808,17 +2300,105 @@ msgstr "สะอา�"
 msgid "Blue"
 msgstr "��ำ��ิ�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1516
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "��รั�รอ�หม�อายุ�ล�ว"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "��รั�รอ�ยั��ม�มี�าร�ริ�ม���"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "��รั�รอ��ม�มีลาย�ิ�วมือ�ี���อ��าร"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "�ื�อ�ฮส���ี��รว�สอ��ล�ว����รั�รอ��ม��ร��ั��ื�อ��ิร���วอร�"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "��รั�รอ�����รั�รอ��ัว�อ�"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "��รั�รอ��ิ�รู����"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "�ื�อ�ฮส���ี���อ��าร: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "�ื�อ�ฮส������รั�รอ�: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#, fuzzy
+#| msgid "Context"
+msgid "Continue"
+msgstr "�ริ��"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
+msgid "Remember this choice for future connections"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#, fuzzy
+#| msgid "Certificate expired"
+msgid "Certificate Details"
+msgstr "��รั�รอ�หม�อายุ�ล�ว"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1705
 msgid "Unable to open URI"
 msgstr "�ม�สามาร���ิ� URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1611
+#: ../libempathy-gtk/empathy-ui-utils.c:1800
 msgid "Select a file"
 msgstr "�ลือ����ม"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
-msgid "Select a destination"
-msgstr "�ลือ��ี������ลาย�า�"
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Insufficient free space to save file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#, fuzzy, c-format
+#| msgid "Incoming call from %s"
+msgid "Incoming file from %s"
+msgstr "�าร�รีย����า�า� %s"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2003,19 +2583,33 @@ msgstr "�ม�มีรายละ�อีย���อ�ิ��ลา
 msgid "Instant Message (Empathy)"
 msgstr "��อ�วาม�ั��� (Empathy)"
 
-#: ../src/empathy.c:601
+#: ../src/empathy.c:308
 msgid "Don't connect on startup"
 msgstr "�ม���อ���ื�อม��อ��ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:605
+#: ../src/empathy.c:312
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�ม���อ��ส��ราย�ื�อ�ู��ิ���อหรือ�ล�อ�����อ�อื������ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:617
+#: ../src/empathy.c:320
 msgid "- Empathy IM Client"
 msgstr "- ลู���าย IM Empathy"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:499
+msgid "Error contacting the Account Manager"
+msgstr ""
+
+#: ../src/empathy.c:501
+#, fuzzy, c-format
+#| msgid "There was an error while parsing the account details."
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr "��ิ���อ�ิ��ลา���ะ���รายละ�อีย��ั��ี"
+
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -2026,7 +2620,7 @@ msgstr ""
 "GNU General Public License �ี���ย��ร���ยมูล�ิ�ิ�อ����วร��สรี �ม�ว�า�ะ����สั��าอ�ุ�า�รุ���ี� 2 "
 "หรือรุ���ั�มา (�าม����ุ��ะ�ลือ�)"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -2038,7 +2632,7 @@ msgstr ""
 "*�วาม�หมาะสมสำหรั�วั��ุ�ระส������าะ�ิ����* �รุ�าอ�า� GNU General Public License "
 "��ื�อ�ูรายละ�อีย���ิ�ม��ิม"
 
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
 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 "
@@ -2048,11 +2642,11 @@ msgstr ""
 "�รุ�า�ิ���อ���ี� Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "��ร��รมลู���าย��อ�วาม�ั���สำหรั� GNOME"
 
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
 "����ิ�ั�ษ� �ารุ��ุ��า�ั���\n"
@@ -2060,28 +2654,28 @@ msgstr ""
 "��ามี�วลา��ร�มา��วย�ั���ล :-)\n"
 "http://gnome-th.sf.net";
 
-#: ../src/empathy-account-assistant.c:168
+#: ../src/empathy-account-assistant.c:167
 msgid "There was an error while importing the accounts."
 msgstr "��ิ���อ�ิ��ลา���ะ�ำ���า�ั��ี"
 
-#: ../src/empathy-account-assistant.c:171
+#: ../src/empathy-account-assistant.c:170
 msgid "There was an error while parsing the account details."
 msgstr "��ิ���อ�ิ��ลา���ะ���รายละ�อีย��ั��ี"
 
-#: ../src/empathy-account-assistant.c:174
+#: ../src/empathy-account-assistant.c:173
 msgid "There was an error while creating the account."
 msgstr "��ิ���อ�ิ��ลา���ะสร�า��ั��ี"
 
-#: ../src/empathy-account-assistant.c:176
+#: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
 msgstr "��ิ���อ�ิ��ลา�"
 
-#: ../src/empathy-account-assistant.c:180
+#: ../src/empathy-account-assistant.c:179
 #, c-format
 msgid "The error message was: %s"
 msgstr "รายละ�อีย���อ�ิ��ลา��ือ: %s"
 
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:183
 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."
@@ -2089,46 +2683,36 @@ msgstr ""
 "�ุ�สามาร��ลั�����อ�รายละ�อีย��อ��ั��ี�อ��ุ��หม� หรือ�ะออ��า���รื�อ�มือ��วย�ี� "
 "�ล�ว��ิ�ม�ั��ี��ภายหลั��า��ม�ู \"�����\" �����"
 
-#: ../src/empathy-account-assistant.c:221
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "��ิ���อ�ิ��ลา�"
 
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:606
-#, c-format
-msgid "New %s account"
-msgstr "�ั��ี %s �หม�"
-
-#: ../src/empathy-account-assistant.c:511
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
 msgstr "�ุ�มี�ั��ีส���า��ิ��ห�?"
 
-#: ../src/empathy-account-assistant.c:517
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "�ุ�มี�ั��ีส���าอื���ี���อ��าร�ั����าอี�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:523
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
 msgstr "��อ�รายละ�อีย��อ��ั��ี�อ��ุ�"
 
-#: ../src/empathy-account-assistant.c:528
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
 msgstr "�ุ���อ��ารสร�า��ั��ีส���า��ิ��ห�?"
 
-#: ../src/empathy-account-assistant.c:534
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
 msgstr "�ุ���อ��าร��ิ�ม�ั��ีส���าอื��อี�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:541
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
 msgstr "��อ�รายละ�อีย��อ��ั��ี�หม��ี��ะสร�า�"
 
-#: ../src/empathy-account-assistant.c:656
+#: ../src/empathy-account-assistant.c:612
 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 "
@@ -2139,41 +2723,41 @@ msgstr ""
 "Talk, AIM, Windows Live �ละ��ร��รมส���าอื��� อี�มา�มาย �ละ��า����ม��ร���หรือ�ว����ม "
 "�ุ���ยั�สามาร��ู��ุย��วย�สีย�หรือภา������วย"
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "�ุ�มี�ั��ี�ี�����ั���ร��รมส���าอื��อยู�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:696
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
 msgstr "มี ��วย�ำ���า��อมูล�ั��ี�อ��ั��า� "
 
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
 msgstr "มี �ั��ะ��อ���อมูล�ั��ี�อ��ั���ี�ยว�ี�"
 
-#: ../src/empathy-account-assistant.c:739
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
 msgstr "�ม�มี �ั���อ��ารสร�า��ั��ี�หม�"
 
-#: ../src/empathy-account-assistant.c:749
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
 msgstr "�ม�มี �ั������อ��าร�ู�ู����ี�ออ��ล��อยู���ล�� ����ั�����อ��ี�"
 
-#: ../src/empathy-account-assistant.c:770
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
 msgstr "�ลือ��ั��ี�ี��ุ���อ��าร�ำ���า:"
 
-#: ../src/empathy-account-assistant.c:854
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "Yes"
 msgstr "���"
 
-#: ../src/empathy-account-assistant.c:861
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "�ม� �อ����ั����อ�"
 
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1085
 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 "
@@ -2184,16 +2768,18 @@ msgstr ""
 "��า�ุ���อ��าร����วามสามาร��ี� �รุ�า�รว�สอ���อมูล��า�ล�า��ี�ว�า�ู���อ�หรือ�ม� "
 "�ุ�สามาร���ลี�ย���อมูล�ี���ภายหลั� หรือ�ิ��วามสามาร��ี������ย��าย ��ย����ล�อ�����อ� '�ั��ี'"
 
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "�����->�ั��ี"
 
-#: ../src/empathy-account-assistant.c:1152
-msgid "I don't want to enable this feature for now"
+#: ../src/empathy-account-assistant.c:1107
+#, fuzzy
+#| msgid "I don't want to enable this feature for now"
+msgid "I do _not want to enable this feature for now"
 msgstr "�ั�ยั��ม���อ��าร��ิ�����วามสามาร��ี����อ��ี�"
 
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2204,66 +2790,67 @@ msgstr ""
 "��า�ุ���อ��าร��ิ�����วามสามาร��ี� �รุ�า�ิ��ั�������� telepathy-salut �ล�วสร�า��ั��ี��ิ� "
 "'�ู�����ว�ี�' �า��ล�อ�����อ� '�ั��ี'"
 
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "�ม�����ิ��ั�� telepathy-salut"
 
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "��รื�อ�มือ��วย�ั����า�ั��ี��อ�วาม�ั����ละ VoIP"
 
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "ยิ��ี��อ�รั�สู� Empathy"
 
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "�ำ���า�ั��ี�อ��ุ��ี�มี"
 
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1256
 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
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
 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
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
 msgstr "�ั��ี�หม��อ��ุ�ยั��ม�����ั��ึ�"
 
-#: ../src/empathy-accounts-dialog.c:273 ../src/empathy-call-window.c:792
+#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-streamed-media-window.c:809
 msgid "Connectingâ?¦"
 msgstr "�ำลั���ื�อม��อ�"
 
-#: ../src/empathy-accounts-dialog.c:314
+#: ../src/empathy-accounts-dialog.c:327
 #, c-format
 msgid "Offline â?? %s"
 msgstr "ออà¸?à¹?ลà¸?à¹? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:326
+#: ../src/empathy-accounts-dialog.c:339
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "à¸?ัà¸?à¸?ารà¹?à¸?ืà¹?อมà¸?à¹?อà¹?ลà¹?ว â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:337
+#: ../src/empathy-accounts-dialog.c:350
 msgid "Offline â?? No Network Connection"
 msgstr "ออà¸?à¹?ลà¸?à¹? â?? à¹?มà¹?มีà¸?ารà¹?à¸?ืà¹?อมà¸?à¹?อà¹?à¸?รือà¸?à¹?าย"
 
-#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-accounts-dialog.c:357
 msgid "Unknown Status"
 msgstr "�ม��รา�ส�า�ะ"
 
-#: ../src/empathy-accounts-dialog.c:356
+#: ../src/empathy-accounts-dialog.c:369
 msgid "Offline â?? Account Disabled"
 msgstr "ออà¸?à¹?ลà¸?à¹? â?? à¸?ัà¸?à¸?ีà¸?ูà¸?ระà¸?ัà¸?"
 
-#: ../src/empathy-accounts-dialog.c:797
+#: ../src/empathy-accounts-dialog.c:772
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2271,16 +2858,16 @@ msgstr ""
 "�ุ��ำลั��ะสร�า��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:1144
+#: ../src/empathy-accounts-dialog.c:1133
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "�ุ���อ��ารล� %s ออ��า���รื�อ��อ��ุ�หรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:1148
+#: ../src/empathy-accounts-dialog.c:1137
 msgid "This will not remove your account on the server."
 msgstr "�ารล��ี��ะ�ม�ล��ั��ี�อ��ุ��ี���ิร���วอร�"
 
-#: ../src/empathy-accounts-dialog.c:1385
+#: ../src/empathy-accounts-dialog.c:1375
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2288,7 +2875,16 @@ msgstr ""
 "�ุ��ำลั��ะ�ลือ��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:1962
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1593
+msgid "_Enable"
+msgstr "_��ิ�����า�"
+
+#: ../src/empathy-accounts-dialog.c:1594
+msgid "_Disable"
+msgstr "�ิ_����"
+
+#: ../src/empathy-accounts-dialog.c:2115
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2297,101 +2893,155 @@ msgstr ""
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "�ำลั��หล���อมูล�ั��ี"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "No protocol installed"
 msgstr "�ม�มี��ร���อล�ิ��ั��อยู�"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Protocol:"
 msgstr "��ร���อล:"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 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:4
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "_Addâ?¦"
 msgstr "�_�ิ�ม�"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Importâ?¦"
 msgstr "_�ำ���า�"
 
-#: ../src/empathy-auto-salut-account-helper.c:79
+#: ../src/empathy-auth-client.c:250
+#, fuzzy
+#| msgid "- Empathy IM Client"
+msgid " - Empathy authentication client"
+msgstr "- ลู���าย IM Empathy"
+
+#: ../src/empathy-auth-client.c:266
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Empathy authentication client"
+msgstr "�ารยื�ยั��ัว�ุ��ล�ม���า�"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "�ู�����ว�ี�"
 
-#: ../src/empathy-call-window.c:463
+#: ../src/empathy-av.c:118
+#, fuzzy
+#| msgid "- Empathy IM Client"
+msgid "- Empathy Audio/Video Client"
+msgstr "- ลู���าย IM Empathy"
+
+#: ../src/empathy-av.c:134
+#, fuzzy
+#| msgid "Empathy IM Client"
+msgid "Empathy Audio/Video Client"
+msgstr "ลู���าย��อ�วาม�ั��� Empathy"
+
+#: ../src/empathy-streamed-media-window.c:479
 msgid "Contrast"
 msgstr "�วาม��า�ระ�ั�สี"
 
-#: ../src/empathy-call-window.c:466
+#: ../src/empathy-streamed-media-window.c:482
 msgid "Brightness"
 msgstr "�วามสว�า�"
 
-#: ../src/empathy-call-window.c:469
+#: ../src/empathy-streamed-media-window.c:485
 msgid "Gamma"
 msgstr "��มมา"
 
-#: ../src/empathy-call-window.c:574
+#: ../src/empathy-streamed-media-window.c:590
 msgid "Volume"
 msgstr "�วาม�ั�"
 
-#: ../src/empathy-call-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1166
 msgid "_Sidebar"
 msgstr "���_��า�"
 
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1186
 msgid "Audio input"
 msgstr "�สีย����า"
 
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1190
 msgid "Video input"
 msgstr "ภา����า"
 
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1194
 msgid "Dialpad"
 msgstr "������รศั���"
 
+#: ../src/empathy-streamed-media-window.c:1205
+#, fuzzy
+#| msgid "Contact Details"
+msgid "Details"
+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:1228
+#: ../src/empathy-streamed-media-window.c:1274
 #, 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:1305
+#: ../src/empathy-streamed-media-window.c:1353
 msgid "Call"
 msgstr "�าร�ุยสาย"
 
+#: ../src/empathy-streamed-media-window.c:1507
+msgid "The IP address as seen by the machine"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1509
+msgid "The IP address as seen by a server on the Internet"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1511
+msgid "The IP address of the peer as seen by the other side"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1513
+msgid "The IP address of a relay server"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1515
+msgid "The IP address of the multicast group"
+msgstr ""
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1962
+#: ../src/empathy-streamed-media-window.c:2270
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "à¹?à¸?ืà¹?อมà¸?à¹?อà¹?ลà¹?ว â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2023
+#: ../src/empathy-streamed-media-window.c:2331
 msgid "Technical Details"
 msgstr "รายละ�อีย��า�����ิ�"
 
-#: ../src/empathy-call-window.c:2061
+#: ../src/empathy-streamed-media-window.c:2369
 #, 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:2066
+#: ../src/empathy-streamed-media-window.c:2374
 #, 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:2072
+#: ../src/empathy-streamed-media-window.c:2380
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2399,23 +3049,23 @@ msgid ""
 msgstr ""
 "�ม�สามาร���ื�อม��อ��ยั� %s ��� ��าย����ายห�ึ��อา�อยู�����รือ��าย�ี��ม�อ�ุ�า��ห���ื�อม��อ��ย�ร�"
 
-#: ../src/empathy-call-window.c:2078
+#: ../src/empathy-streamed-media-window.c:2386
 msgid "There was a failure on the network"
 msgstr "��ิ��วามล�ม�หลว����รือ��าย"
 
-#: ../src/empathy-call-window.c:2082
+#: ../src/empathy-streamed-media-window.c:2390
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "�ารรอ�รั��อร��ม��สีย��ี��ำ������อ�������าร�รีย�สาย�ี� ยั��ม�����ิ��ั��ล����อม�ิว��อร��อ��ุ�"
 
-#: ../src/empathy-call-window.c:2085
+#: ../src/empathy-streamed-media-window.c:2393
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "�ารรอ�รั��อร��ม�วี�ิ�ัศ���ี��ำ������อ�������าร�รีย�สาย�ี� ยั��ม�����ิ��ั��ล����อม�ิว��อร��อ��ุ�"
 
-#: ../src/empathy-call-window.c:2095
+#: ../src/empathy-streamed-media-window.c:2403
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2425,111 +3075,145 @@ msgstr ""
 "��ิ�สิ���ม��า��ิ���อ����ระ�อ� Telepathy  �รุ�า <a href=\"%s\">ราย�า��ั���ี�</a> "
 "�ร�อม����ูม�ี�����า�ห��า��า� '�ี�ั��' ���ม�ูวิ�ี�������วย"
 
-#: ../src/empathy-call-window.c:2103
+#: ../src/empathy-streamed-media-window.c:2411
 msgid "There was a failure in the call engine"
 msgstr "��ิ��วามล�ม�หลว���ล���าร�รีย�สาย"
 
-#: ../src/empathy-call-window.c:2142
+#: ../src/empathy-streamed-media-window.c:2414
+msgid "The end of the stream was reached"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2454
 msgid "Can't establish audio stream"
 msgstr "�ม�สามาร���ื�อม��อส�รีม�สีย����"
 
-#: ../src/empathy-call-window.c:2152
+#: ../src/empathy-streamed-media-window.c:2464
 msgid "Can't establish video stream"
 msgstr "�ม�สามาร���ื�อม��อส�รีมวี�ิ�ัศ�����"
 
 #: ../src/empathy-call-window.ui.h:1
+#, fuzzy
+#| msgid "Auto"
+msgid "Audio"
+msgstr "ออ�ิ�อ"
+
+#: ../src/empathy-call-window.ui.h:2
 msgid "Call the contact again"
 msgstr "�รีย��ู��ิ���ออี��รั��"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
 msgid "Camera Off"
 msgstr "�ิ��ล�อ�"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Camera On"
 msgstr "��ิ��ล�อ�"
 
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:6
 msgid "Disable camera and stop sending video"
 msgstr "�ิ��ล�อ��ละหยุ�ส��วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
 msgid "Enable camera and send video"
 msgstr "��ิ��ล�อ��ละส��วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
 msgid "Enable camera but don't send video"
 msgstr "��ิ��ล�อ�����ม���อ�ส��วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Hang up"
 msgstr "วา�สาย"
 
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
 msgid "Hang up current call"
 msgstr "วา�สาย�ั��ุ�ั�"
 
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:13
 msgid "Preview"
 msgstr "�ส���ัวอย�า�"
 
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
 msgid "Redial"
 msgstr "�รีย���ำ"
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:16
 msgid "Send Audio"
 msgstr "ส��สั��า��สีย�"
 
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "��ิ�-�ิ��ารส��สั��า��สีย�"
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
 msgid "V_ideo"
 msgstr "_วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "วี�ิ�ัศ��"
+
+#: ../src/empathy-call-window.ui.h:21
 msgid "Video Off"
 msgstr "�ิ�วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
 msgid "Video On"
 msgstr "��ิ�วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
 msgid "Video Preview"
 msgstr "�ส���ัวอย�า�วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "�_รีย�สาย"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
 msgid "_View"
 msgstr "มุ_มมอ�"
 
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:486
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (�ละอี� %u ��)"
 
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:502
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม�า���อื��)"
 
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:511
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม�า��ุ���)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:721
 msgid "Typing a message."
 msgstr "�ำลั��ิม����อ�วาม"
 
@@ -2546,25 +3230,25 @@ msgid "Chat"
 msgstr "�ารส���า"
 
 #: ../src/empathy-chat-window.ui.h:4
-msgid "Important Room"
-msgstr "ห�อ�สำ�ั�"
-
-#: ../src/empathy-chat-window.ui.h:5
 msgid "Insert _Smiley"
 msgstr "��ร�รู�_สีห��า"
 
-#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participantâ?¦"
 msgstr "��ิ��ู�ร�วมส���า�"
 
-#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "ย�าย�������า�_��าย"
 
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "ย�าย�������า�_�วา"
 
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "�����ห�ุ�ุ���อ�วาม"
+
 #: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "��ื�อ_หา"
@@ -2625,76 +3309,92 @@ msgstr "��ื�อม��ออั���มั�ิ"
 msgid "Manage Favorite Rooms"
 msgstr "�ั��ารห�อ���ร�"
 
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:507
 msgid "Incoming video call"
 msgstr "�าร�รีย����า��ื�อส���า��วยวี�ิ�ัศ��"
 
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:507
 msgid "Incoming call"
 msgstr "�าร�รีย����า"
 
-#: ../src/empathy-event-manager.c:355
+#: ../src/empathy-event-manager.c:511
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �ำลั��รีย�สาย�ุ�อยู� ��ื�อส���า��วยวี�ิ�ัศ�� �ุ���อ��าร�ะ�อ�รั�หรือ�ม�?"
 
-#: ../src/empathy-event-manager.c:356
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �ำลั��รีย�สาย�ุ�อยู� �ุ���อ��าร�ะ�อ�รั�หรือ�ม�?"
 
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#, c-format
+msgid "Incoming call from %s"
+msgstr "�าร�รีย����า�า� %s"
+
+#: ../src/empathy-event-manager.c:540
 msgid "_Reject"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:384
+#: ../src/empathy-event-manager.c:546
 msgid "_Answer"
 msgstr "_�อ�รั�"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:667
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "�าร�รีย����า��วยวี�ิ�ัศ���า� %s"
 
-#: ../src/empathy-event-manager.c:501
-#, c-format
-msgid "Incoming call from %s"
-msgstr "�าร�รีย����า�า� %s"
-
-#: ../src/empathy-event-manager.c:598
+#: ../src/empathy-event-manager.c:744
 msgid "Room invitation"
 msgstr "�ำ��ิ�สู�ห�อ�ส���า"
 
-#: ../src/empathy-event-manager.c:601
+#: ../src/empathy-event-manager.c:746
+#, c-format
+msgid "Invitation to join %s"
+msgstr "�ำ��ิ����าร�วมส���า�ี�ห�อ� %s"
+
+#: ../src/empathy-event-manager.c:753
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ��ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#: ../src/empathy-event-manager.c:609
+#: ../src/empathy-event-manager.c:761
 msgid "_Decline"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:614
+#: ../src/empathy-event-manager.c:766
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "�_��าห�อ�"
 
-#: ../src/empathy-event-manager.c:653
+#: ../src/empathy-event-manager.c:793
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s �����ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#: ../src/empathy-event-manager.c:679
+#: ../src/empathy-event-manager.c:799
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "�ุ�����ู���ิ����าร�วมส���า�ี�ห�อ� %s"
+
+#: ../src/empathy-event-manager.c:850
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "�าร��า��อ����ม���า�า� %s"
 
-#: ../src/empathy-event-manager.c:829
+#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#, fuzzy
+#| msgid "Password:"
+msgid "Password required"
+msgstr "รหัส��า�:"
+
+#: ../src/empathy-event-manager.c:1076
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "มี�าร�อสมั�ร�า� %s"
+msgid "%s would like permission to see when you are online"
+msgstr ""
 
-#: ../src/empathy-event-manager.c:833
+#: ../src/empathy-event-manager.c:1080
 #, c-format
 msgid ""
 "\n"
@@ -2703,116 +3403,106 @@ msgstr ""
 "\n"
 "��อ�วาม: %s"
 
-#: ../src/empathy-event-manager.c:877
-#, c-format
-msgid "%s is now offline."
-msgstr "%s ออ��ล���ล�ว"
-
-#: ../src/empathy-event-manager.c:899
-#, c-format
-msgid "%s is now online."
-msgstr "%s ออ��ล���ล�ว"
-
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, 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:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�ม��รา�"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s �า� %s �ี� %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, 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:306
+#: ../src/empathy-ft-manager.c:305
 #, 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:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "�ำลั�ส�� \"%s\" �ห��ั� %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "��ิ���อ�ิ��ลา���ะรั� \"%s\" �า� %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "��ิ���อ�ิ��ลา���ะรั����ม"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "��ิ���อ�ิ��ลา���ะส�� \"%s\" �ห��ั� %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "��ิ���อ�ิ��ลา���ะส�����ม"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "รั� \"%s\" �า� %s �รีย�ร�อย"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ส�� \"%s\" �ห��ั� %s �รีย�ร�อย"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "��าย�อ����ม�สร��สม�ูร��"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "�ำลั�รอ�ห�อี���ายห�ึ���อ��ลั�"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "�ำลั��รว�สอ��วาม�ร���ว��อ� \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "�ำลั��ำ�ว��ฮ��อ� \"%s\""
 
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:1016
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1028
 msgid "File"
 msgstr "���ม"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1050
 msgid "Remaining"
 msgstr "�หลืออี�"
 
@@ -2835,95 +3525,116 @@ msgid "Import Accounts"
 msgstr "�ำ���า�ั��ี"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
 msgstr "�ำ���า"
 
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
 msgstr "��ร���อล"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
 msgstr "�หล����อมูล"
 
-#: ../src/empathy-import-mc4-accounts.c:108
-#, c-format
-msgid "%s account"
-msgstr "�ั��ี %s"
+#: ../src/empathy-main-window.c:387
+#, fuzzy
+#| msgid "Password:"
+msgid "Provide Password"
+msgstr "รหัส��า�:"
 
-#: ../src/empathy-main-window.c:440
+#: ../src/empathy-main-window.c:393
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "�ั��าร��ื�อม��อ�ล�ว"
+
+#: ../src/empathy-main-window.c:533
+#, fuzzy
+#| msgid "No topic defined"
+msgid "No match found"
+msgstr "�ม�มี�าร�ำห��หัว��อ"
+
+#: ../src/empathy-main-window.c:688
 msgid "Reconnect"
 msgstr "��ื�อม��อ�หม�"
 
-#: ../src/empathy-main-window.c:446
+#: ../src/empathy-main-window.c:694
 msgid "Edit Account"
 msgstr "������ั��ี"
 
-#: ../src/empathy-main-window.c:452
+#: ../src/empathy-main-window.c:700
 msgid "Close"
 msgstr "�ิ�"
 
-#: ../src/empathy-main-window.c:1113
+#: ../src/empathy-main-window.c:1418
 msgid "Contact"
 msgstr "�ู��ิ���อ"
 
-#: ../src/empathy-main-window.c:1500
+#: ../src/empathy-main-window.c:1765
+msgid "Contact List"
+msgstr "ราย�ื�อ�ู��ิ���อ"
+
+#: ../src/empathy-main-window.c:1881
 msgid "Show and edit accounts"
 msgstr "�ส���ละ������ั��ี��า��"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "ราย�ื�อ�ู��ิ���อ"
-
-#: ../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.ui.h:2
+#, fuzzy
+#| msgid "Contact List"
+msgid "Find in Contact _List"
+msgstr "ราย�ื�อ�ู��ิ���อ"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "���าห�อ��_�ร�"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "�ั��ารห�อ���ร�"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "��า�_���ิ"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
 msgstr "_สาย�หม��"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "��า����ิ�ร�อมรู��_���ัว"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
 msgid "P_references"
 msgstr "_�รั�����"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
 msgid "Show P_rotocols"
 msgstr "�ส���_�ร���อล"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "�รีย��าม_�ื�อ"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "�รีย��าม_ส�า�ะ"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "_�ั��ี"
 
+#: ../src/empathy-main-window.ui.h:14
+#, fuzzy
+#| msgid "_Offline Contacts"
+msgid "_Blocked Contacts"
+msgstr "�ู��ิ���อ�ี�_ออ��ล��"
+
 #: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "��า�_�ะ�ั�รั�"
@@ -2956,20 +3667,31 @@ msgstr "_��อมูลส�ว��ุ��ล"
 msgid "_Room"
 msgstr "_ห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-main-window.ui.h:28
+#, fuzzy
+#| msgid "_Show Contact List"
+msgid "_Search for Contactsâ?¦"
+msgstr "�_ส��ราย�ื�อ�ู��ิ���อ"
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "ห�อ�ส���า"
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:353
 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:605
-#, c-format
+#: ../src/empathy-new-chatroom-dialog.c:560
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b>\n"
+#| "Invite required: %s\n"
+#| "Password required: %s\n"
+#| "Members: %s"
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
@@ -2979,16 +3701,16 @@ msgstr ""
 "��อ����รหัส��า�: %s\n"
 "สมา�ิ�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "No"
 msgstr "�ม����"
 
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:591
 msgid "Could not start room listing"
 msgstr "�ม�สามาร��ริ�ม�ส��ราย�ื�อห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:601
 msgid "Could not stop room listing"
 msgstr "�ม�สามาร�หยุ��ส��ราย�ื�อห�อ�"
 
@@ -3019,38 +3741,42 @@ msgstr "ราย�ื�อห�อ�"
 msgid "_Room:"
 msgstr "_ห�อ�:"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Message received"
 msgstr "���รั���อ�วาม"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Message sent"
 msgstr "ส����อ�วาม"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:141
 msgid "New conversation"
 msgstr "�ารส���า�หม�"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes online"
 msgstr "�ู��ิ���อ���าสู�ระ��"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:143
 msgid "Contact goes offline"
 msgstr "�ู��ิ���อออ��า�ระ��"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:144
 msgid "Account connected"
 msgstr "�ั��ีมี�าร��ื�อม��อ"
 
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:145
 msgid "Account disconnected"
 msgstr "�ั��ี�ั��าร��ื�อม��อ"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:446
 msgid "Language"
 msgstr "ภาษา"
 
+#: ../src/empathy-preferences.c:875
+msgid "Preferences"
+msgstr "�รั�����"
+
 #: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "ห��า�า"
@@ -3072,46 +3798,52 @@ msgid "Disable sounds when _away or busy"
 msgstr "�ิ��าร����สีย��มื�อ�_ม�อยู�หรือ�ม�ว�า�"
 
 #: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "��ิ�����าร�����ห�ุ�มื�อ�ู��ิ���อ_ออ��ล��"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "��ิ�����าร�����ห�ุ�มื�อ�ู��ิ���อออ_��ล��"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "��ิ�����าร�����ห�ุ�มื�อห��า��า�_ส���า�ม�������ัส"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
 msgstr "��ิ�����าร�รว��ัวสะ��สำหรั�ภาษา:"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "�ั�ว��"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Location sources:"
 msgstr "�หล����อมูล�ำ�ห����ี��ั��:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+#, fuzzy
+#| msgid "Conversations"
+msgid "Log conversations"
+msgstr "�ารส���า"
+
+#: ../src/empathy-preferences.ui.h:15
 msgid "Notifications"
 msgstr "�าร�����ห�ุ"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:16
 msgid "Play sound for events"
 msgstr "�ล���สีย�สำหรั��ห�ุ�าร����า��"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Preferences"
-msgstr "�รั�����"
-
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "�วาม����ส�ว��ัว"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 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 "
@@ -3120,72 +3852,69 @@ msgstr ""
 "�วามละ�อีย��อ��ำ�ห����ี��ั���ี�ล�ล� �ะหมาย�ึ��าร�ม��ระ�าศ��อมูล�ี�ละ�อีย����ว�า�มือ� รั� "
 "�ละ�ระ��ศ�ี��ุ�อยู� �ิ�ั��า� GPS �ะละ�อีย��ึ��ศ�ิยมห�ึ���ำ�ห���"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "�ส��รู�_สีห��า���รู�ภา�"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "�ส��_ราย�ื�อ�ู��ิ���อ��ห�อ���า��"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "�สีย�"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "�าร�รว��ัวสะ��"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ราย�ื�อภาษา�ี��ะมี��ีย�ภาษา�ี��ุ�����ิ��ั�����า�ุ�รม�ว����า�ั��"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "�ุ�������"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "_Automatically connect on startup"
 msgstr "��ื�อม_��อ��ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Cellphone"
 msgstr "�_�รศั���มือ�ือ"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable bubble notifications"
 msgstr "�_�ิ�����รอ��ำ�ู������ห�ุ"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable sound notifications"
 msgstr "�_�ิ�����าร�����ห�ุ��วย�สีย�"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Network (IP, Wi-Fi)"
 msgstr "�_�รือ��าย (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Open new chats in separate windows"
 msgstr "_��ิ��ารส���า�หม���ห��า��า��ย�"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Publish location to my contacts"
 msgstr "_�ระ�าศ�ำ�ห����ี��ั����ยั��ู��ิ���อ�อ��ั�"
 
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Reduce location accuracy"
 msgstr "_ล��วามละ�อีย��อ��ำ�ห����ี��ั��"
 
-#: ../src/empathy-status-icon.c:178
-msgid "Respond"
-msgstr "�อ�รั�"
-
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ส�า�ะ"
@@ -3194,67 +3923,67 @@ msgstr "ส�า�ะ"
 msgid "_Quit"
 msgstr "_ออ�"
 
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:442
 msgid "Contact Map View"
 msgstr "����ี��ู��ิ���อ"
 
-#: ../src/empathy-debug-window.c:1154
+#: ../src/empathy-debug-window.c:1218
 msgid "Save"
 msgstr "�ั��ึ�"
 
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1394
 msgid "Debug Window"
 msgstr "ห��า��า��ี�ั��"
 
-#: ../src/empathy-debug-window.c:1410
+#: ../src/empathy-debug-window.c:1476
 msgid "Pause"
 msgstr "�ั�"
 
-#: ../src/empathy-debug-window.c:1422
+#: ../src/empathy-debug-window.c:1488
 msgid "Level "
 msgstr "ระ�ั� "
 
-#: ../src/empathy-debug-window.c:1442
+#: ../src/empathy-debug-window.c:1508
 msgid "Debug"
 msgstr "�ี�ั��"
 
-#: ../src/empathy-debug-window.c:1448
+#: ../src/empathy-debug-window.c:1514
 msgid "Info"
 msgstr "��อมูล"
 
-#: ../src/empathy-debug-window.c:1454 ../src/empathy-debug-window.c:1503
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
 msgid "Message"
 msgstr "��อ�วาม"
 
-#: ../src/empathy-debug-window.c:1460
+#: ../src/empathy-debug-window.c:1526
 msgid "Warning"
 msgstr "�ำ��ือ�"
 
-#: ../src/empathy-debug-window.c:1466
+#: ../src/empathy-debug-window.c:1532
 msgid "Critical"
 msgstr "วิ�ฤ�ิ"
 
-#: ../src/empathy-debug-window.c:1472
+#: ../src/empathy-debug-window.c:1538
 msgid "Error"
 msgstr "��อ�ิ��ลา�"
 
-#: ../src/empathy-debug-window.c:1491
+#: ../src/empathy-debug-window.c:1557
 msgid "Time"
 msgstr "�วลา"
 
-#: ../src/empathy-debug-window.c:1494
+#: ../src/empathy-debug-window.c:1560
 msgid "Domain"
 msgstr "���ม�"
 
-#: ../src/empathy-debug-window.c:1496
+#: ../src/empathy-debug-window.c:1562
 msgid "Category"
 msgstr "หมว�"
 
-#: ../src/empathy-debug-window.c:1498
+#: ../src/empathy-debug-window.c:1564
 msgid "Level"
 msgstr "ระ�ั�"
 
-#: ../src/empathy-debug-window.c:1535
+#: ../src/empathy-debug-window.c:1601
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3273,37 +4002,137 @@ msgstr "�ลือ��ู��ิ���อ�ี��ะ��ิ��
 msgid "Invite"
 msgstr "��ิ�"
 
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "�ม���อ��ส���ล�อ�����อ���� �ำ�า��าม�ี�สั�� (���� �ำ���า) �ล�ว����ร��รม"
 
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
+#: ../src/empathy-accounts.c:187
+#, fuzzy
+#| msgid "Don't display any dialogs if there are any non-salut accounts"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "�ม���อ��ส���ล�อ�����อ���� ��ามี�ั��ี�ี��ม���� salut อยู�"
 
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "�ลือ��ั��ี�ี��ำห���มื�อ�ริ�ม�ำ�า� (���� gabble/jabber/foo_40example_2eorg0)"
 
 # This is part of "Add new <type> account" message
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<�ื�อ�ั��ี>"
 
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- �ั��ี Empathy"
 
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "�ั��ี Empathy"
 
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
 msgid "Empathy Debugger"
 msgstr "��รื�อ�มือ�ี�ั�� Empathy"
 
-#~ msgid "Empathy IM Client"
-#~ msgstr "ลู���าย��อ�วาม�ั��� Empathy"
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- ลู���าย���� Empathy"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "�อ�"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "��ิ�ส�"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "รั�สาย"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "��ิ�ส�"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "รั�"
+
+#: ../src/empathy-call-observer.c:130
+#, c-format
+msgid "Missed call from %s"
+msgstr "สาย�ี��ม����รั��า� %s"
+
+#: ../src/empathy-call-observer.c:133
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr ""
+
+#~ msgid "Send and receive messages"
+#~ msgstr "รั��ละส����อ�วาม"
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี���ล�ว"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "����ำ���า�ั��ี MC 4 �ล�ว"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "����ำ���า�ั��ี MC 4 ���ล�ว"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "�ำห��ว�า Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี�า���ร��รมอื�����ล�วหรือยั�"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "��า�ฮ��อ����ม�ี�รั��ั��อ����ม�ี�ส���ม��ร��ั�"
+
+#~ msgid "_Character set:"
+#~ msgstr "รหัส_อั��ระ:"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "�ี�อยู�_อี�มล:"
+
+#~ msgid "_Nickname:"
+#~ msgstr "�ื�อ�_รีย�:"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "��� Yahoo! �ี��ุ�_�"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "��ื�อม��อ�ารส���า�ี���ำ�ม�สำ�ร��"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "���าห�อ�ส���า�ม�สำ�ร��"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>�ำ�ห����ี��ั��</b>, "
+
+#~ msgid "Add _New Preset"
+#~ msgstr "�_�ิ�ม��อ�วาม�ำห��ล�ว�ห��าอั��หม�"
+
+#~ msgid "Saved Presets"
+#~ msgstr "��อ�วาม�ำห��ล�ว�ห��า�ี��ั��ึ��ว�"
+
+#~ msgid "Select a destination"
+#~ msgstr "�ลือ��ี������ลาย�า�"
+
+#~ msgid "Important Room"
+#~ msgstr "ห�อ�สำ�ั�"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "มี�าร�อสมั�ร�า� %s"
+
+#~ msgid "%s is now offline."
+#~ msgstr "%s ออ��ล���ล�ว"
+
+#~ msgid "%s is now online."
+#~ msgstr "%s ออ��ล���ล�ว"
+
+#~ msgid "%s account"
+#~ msgstr "�ั��ี %s"
 
 #~ msgid "Salut account is created"
 #~ msgstr "สร�า��ั��ี Salut �ล�ว"