[empathy] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit 084d6772c28d3191af02cc86fd0b27f92f585edf
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Wed Dec 23 10:56:17 2009 +0700

    Updated Thai translation.

 po/th.po | 1568 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 993 insertions(+), 575 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index 5eef472..a0c1654 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-10-02 16:41+0000\n"
-"PO-Revision-Date: 2009-10-22 08:23+0700\n"
+"POT-Creation-Date: 2009-12-21 14:04+0000\n"
+"PO-Revision-Date: 2009-12-23 10:55+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgid "Connection managers should be used"
 msgstr "�����ร��รม�ั��าร�าร��ื�อม��อ"
 
 #: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
+msgid "Contact list sort criterion"
 msgstr "วิ�ี�รีย�ลำ�ั��ื�อ�ู��ิ���อ"
 
 #: ../data/empathy.schemas.in.h:8
@@ -217,207 +217,211 @@ msgid "Show offline contacts"
 msgstr "�ส���ู��ิ���อ�ี�ออ��ล��"
 
 #: ../data/empathy.schemas.in.h:46
+msgid "Show protocols"
+msgstr "�ส����ร���อล"
+
+#: ../data/empathy.schemas.in.h:47
 msgid "Spell checking languages"
 msgstr "ภาษา�ี��รว��ัวสะ��"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "��ล��อร��ริยาย�ี��ะ�ั��ึ����ม�ี���าย�อ����ามา"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "���ร��อรีล�าสุ��ี��ู�����ลือ�รู�����ัว"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "�ุ��������ี��ะ����ส���ารส���า��ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
 msgid "Use graphical smileys"
 msgstr "���รู�สีห��า����รา�ิ�ส�"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:52
 msgid "Use notification sounds"
 msgstr "����สีย������ห�ุ"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:53
 msgid "Use theme for chat rooms"
 msgstr "����ุ��������ั�ห�อ�ส���า"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "�ำห��ว�า�ะ��ิ������รื�อ�มือ�ั��า�อ� WebKit ���� ��รื�อ�มือ���าสั�����ว�� หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "�ำห��ว�า Empathy สามาร��ระ�าศ�ำ�ห����ี��ั���อ��ู������อ�ู��ิ���อหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:56
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "�ำห��ว�า Empathy สามาร���� GPS ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "�ำห��ว�า Empathy สามาร������รือ��าย��รศั���มือ�ือ���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:58
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "�ำห��ว�า Empathy สามาร������รือ��าย���าร��า�ำ�ห����ี��ั�����หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "�ำห��ว�า Empathy ����าม��ี�ยว�ั��าร�ำ���า�ั��ี�า���ร��รมอื�����ล�วหรือยั�"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "�ำห��ว�า�ะ�ห� Empathy ���าระ�����ั��ี�อ��ุ���ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr "�ำห��ว�า Empathy �วรล��วามละ�อีย��อ��ำ�ห����ี��ั����ื�อ�วาม����ส�ว��ัวหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "�ำห��ว�า�ะ�ห� Empathy ���รู�����ัว�อ��ู��ิ���อ�����อ�อ��อ�ห��า��า�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not connectivity managers should be used to automatically "
 "disconnect/reconnect."
 msgstr ""
 "�ำห��ว�า�ะ�����ร��รม�ั��าร�าร��ื�อม��อ���าร�ั��าร��ื�อม��อ/��ื�อม��อ�หม���ยอั���มั�ิหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "�ำห��ว�า���สร�า��ั��ี Salut ���ล�วหรือยั� �มื�อ�รีย� Empathy �รั���ร�"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "�ำห��ว�า�ะ�รว��ัวสะ���อ��ำ�ี���อ��ามภาษา�ี��ุ���อ��าร�ะ�รว�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:66
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "�ำห��ว�า�ะ��ล���อ�วามรู�สีห��า (smiley) ����ภา��รา�ิ�ส�หรือ�ม���ห��า��า�ส���า"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:67
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อ���าสู�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:68
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����มื�อมี�ู��ิ���อออ��า�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for events."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ห�ุ��ี�ยว�ั��ห�ุ�าร����า�� หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ������อ�วาม���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส���า�หม�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "�ำห��ว�า�ะ�ล���สีย���ื�อ�����ารส����อ�วามออ�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อ���าสู�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "�ำห��ว�า�ะ�ล���สีย��มื�อออ��า�ระ����รือ��ายหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:75
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ล���สีย��มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อมี�ู��ิ���อออ��ล��หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:78
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
 "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุหรือ�ม��มื�อ���รั���อ�วาม�หม� �ม�ห��า��า�ส���า�ะ��ิ�อยู� ����ม�������ัส"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:79
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "�ำห��ว�า�ะ�ุ���อ�วาม�����ห�ุ�มื�อ���รั���อ�วาม�หม�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:80
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "�ำห��ว�า�ะ�ส��รู�����ัว�อ��ู��ิ���อ��ราย�ื�อ�ู��ิ���อ�ละ��ห��า��า�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "�ำห��ว�า�ะ�ส���ู��ิ���อ�ี�ออ��ล����ราย�ื�อ�ู��ิ���อ��วยหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "�ำห��ว�า�ะ���ุ���อ�วาม�����ห�ุ�มื�อ�ม�อยู�หรือ�ม�ว�า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:83
+msgid "Whether or not to show protocols for contacts in the contact list."
+msgstr "�ำห��ว�า�ะ�ส����ร���อล�อ��ู��ิ���อ��ราย�ื�อ�ู��ิ���อหรือ�ม�"
+
+#: ../data/empathy.schemas.in.h:84
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ��ห�อ�ส���า��า�� หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr "�ำห��ว�า�ะ�ส���ล�อ���อ�วาม��ี�ยว�ั�วิ�ี�ิ�ห��า��า�หลั���วย�ุ�ม 'x' �����หัวห��า��า�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "�ำห��ว�า�ะ�ส��ราย�ื�อ�ู��ิ���อ����ระ�ั�หรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:87
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "�ำห��ว�า�ะ����ุ��������ั�ห�อ�ส���าหรือ�ม�"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:88
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
+"Which criterion to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
 "��อ�ำห���าร�รีย�ลำ�ั�ราย�ื�อ�ู��ิ���อ ��า�ริยาย�ือ�รีย�ลำ�ั��าม�ื�อ�ู��ิ���อ ��ย�����า \"name\" "
 "��า�ะ�รีย��ามส�า�ะ�อ��ู��ิ���อ����� \"state\""
 
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "�ม�สามาร��ำห���ื�อ�ส���ล�����ื�อว�า���ล�า���"
-
 #: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
 msgstr "��า�ฮ��อ����ม�ี�รั��ั��อ����ม�ี�ส���ม��ร��ั�"
@@ -434,7 +438,7 @@ msgstr "���ม�ี��ลือ��ม�������ม��
 msgid "The selected file is empty"
 msgstr "���ม�ี��ลือ�ว�า���ล�า"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
 msgid "People nearby"
 msgstr "�ู�����ว�ี�"
 
@@ -466,39 +470,95 @@ msgstr "��ิ���อ�ิ��ลา���ะ�ยายาม�
 msgid "The other participant is unable to transfer the file"
 msgstr "อี���ายห�ึ���ม�สามาร���าย�อ����ม���"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
 msgid "Unknown reason"
 msgstr "�ม��รา�สา�ห�ุ"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
 msgid "Available"
 msgstr "อยู�"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
 msgid "Busy"
 msgstr "�ม�ว�า�"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
 msgid "Away"
 msgstr "�ม�อยู�"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:245
 msgid "Hidden"
 msgstr "��อ��ัว"
 
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
 msgid "Offline"
 msgstr "ออ��ล��"
 
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "�ม�มี�ารระ�ุสา�ห�ุ"
+
+#: ../libempathy/empathy-utils.c:288
+msgid "User requested disconnect"
+msgstr "�ู�����อ�ั��าร��ื�อม��อ"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "��อ�ิ��ลา���ี�ยว�ั���รือ��าย"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "�ารยื�ยั��ัว�ุ��ล�ม���า�"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "��อ�ิ��ลา���ี�ยว�ั��าร���ารหัสลั�"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "�ื�อ�ู����อยู�"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "�ม�มี��รั�รอ�"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "�ม���ื�อ�ือ��รั�รอ�"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "��รั�รอ�หม�อายุ�ล�ว"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "��รั�รอ�ยั��ม�มี�าร�ริ�ม���"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "�ื�อ�ฮส������รั�รอ��ม��ร��ั�"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "ลาย�ิ�วมือ����รั�รอ��ม��ร��ั�"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "��รั�รอ�����รั�รอ��ัว�อ�"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "��อ�ิ��ลา���ี�ยว�ั���รั�รอ�"
+
+#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "�ู�����ว�ี�"
 
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:429
 msgid "Yahoo! Japan"
 msgstr "Yahoo! �ี��ุ��"
 
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:430
 msgid "Facebook Chat"
 msgstr "�ารส���า Facebook"
 
@@ -542,33 +602,54 @@ msgstr[0] "%d ��ือ���อ�"
 msgid "in the future"
 msgstr "��อ�า��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:450
 msgid "All"
 msgstr "�ั��หม�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:433
-#: ../libempathy-gtk/empathy-account-widget.c:489
+#: ../libempathy-gtk/empathy-account-widget.c:526
+#: ../libempathy-gtk/empathy-account-widget.c:582
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1252
+#: ../libempathy-gtk/empathy-account-widget.c:1300
 msgid "L_og in"
 msgstr "�_��าระ��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1302
+#: ../libempathy-gtk/empathy-account-widget.c:1508
 msgid "Enabled"
 msgstr "��ิ����"
 
 #.  Translators: this is used only when built on a moblin platform 
-#: ../libempathy-gtk/empathy-account-widget.c:1308
+#: ../libempathy-gtk/empathy-account-widget.c:1514
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../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 "�ั��ี:"
 
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:1773
+#, 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:1791
+#, c-format
+msgid "%s Account"
+msgstr "�ั��ี %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1795
+msgid "New account"
+msgstr "�ั��ี�หม�"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
 msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> MyScreenName</span>"
@@ -580,7 +661,7 @@ msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> MyScreenName</span
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "�ั��สู�"
@@ -590,7 +671,7 @@ msgstr "�ั��สู�"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "_รหัส��า�:"
@@ -670,6 +751,39 @@ msgstr "รหัส_อั��ระ:"
 msgid "New Network"
 msgstr "��รือ��าย�หม�"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+msgid "Auto"
+msgstr "อั���มั�ิ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+msgid "Register"
+msgstr "Register"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr "�ัว�ลือ�"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "�ม����"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "รหัสอั��ระ:"
@@ -795,31 +909,107 @@ msgid "_Published Name:"
 msgstr "�ื�อ�ี�_�ระ�าศ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<b>Keep-Alive Options</b>"
+msgstr "<b>�ัว�ลือ��าร���าร��ื�อม��อ</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "<b>Miscellaneous Options</b>"
+msgstr "<b>�ัว�ลือ�������ล��</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>NAT Traversal Options</b>"
+msgstr "<b>�ัว�ลือ�สำหรั��ส���า� NAT</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "<b>Proxy Options</b>"
+msgstr "<b>�ัว�ลือ�สำหรั��ร�อ��ี</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
 msgstr "<span size=\"small\"><b>�ัวอย�า�:</b> user my sip server</span>"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "���หา STUN"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Authentication username:"
+msgstr "�ื�อ�ู����สำหรั�ยื�ยั��ัว�ุ��ล:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Discover Binding"
+msgstr "���หา Binding"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Discover the STUN server automatically"
+msgstr "���หา��ิร���วอร� STUN ��ยอั���มั�ิ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Hostname of the proxy for outbound requests."
+msgstr "�ื�อ�ฮส���อ��ร�อ��ีสำหรั��าร�รีย��าออ�"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Interval (seconds)"
+msgstr "��ว��วลา (วิ�า�ี)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr "��ิ���อมูล SRV �อ� DNS �ี����ม��อ��ริ�าร ��ื�อหา�ื�อ�ฮส���อ���ิร���วอร� STUN"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Loose Routing"
+msgstr "����าร�ั��ส���า����หลวม"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism:"
+msgstr "�ล��:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port of the proxy for outbound requests."
+msgstr "�อร���อ��ร�อ��ีสำหรั��าร�รีย��าออ�"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Port:"
+msgstr "�อร��:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "��ิร���วอร� STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "�อร�� STUN:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "��ิร���วอร�:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr "�ื�อ�ู����สำหรั�ยื�ยั��ัว�ุ��ล�ั� SIP ���ร�ี�ี�����ื�อ��า��า��ื�อ�ู������ URI �อ� SIP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Transport:"
+msgstr "�ารรั�ส����อมูล:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"�รั���อมูล registration binding ��า��ว�า�ี�อยู�ภาย�อ��อ�ลู���าย��า��า� local binding"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr "����าร�ั��ส���า����หลวม�ละ�����อมูส�ว�หัว Route �าม�ี���ะ�ำ�� RFC 3261"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "What is your SIP account password?"
 msgstr "รหัส��า��ั��ี SIP �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
 msgid "What is your SIP login ID?"
 msgstr "�ื�อ�ั��ี SIP �อ��ุ��ืออะ�ร?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
 msgid "_Username:"
 msgstr "_�ื�อ�ู����:"
 
@@ -856,91 +1046,163 @@ msgstr "�ม�สามาร���ล�รู�ภา����"
 msgid "None of the accepted image formats is supported on your system"
 msgstr "ระ���อ��ุ��ม�รอ�รั��อร��ม�รู�ภา���� �ี���ร��รมยอมรั��ลย"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
 msgid "Select Your Avatar Image"
 msgstr "�ลือ�รู�����ัว�อ��ุ�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
 msgid "No Image"
 msgstr "�ม�มีรู�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
 msgid "Images"
 msgstr "รู�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
 msgid "All Files"
 msgstr "�ุ����ม"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
 msgid "Click to enlarge"
 msgstr "�ลิ���ื�อ�ยาย"
 
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:199
 msgid "Failed to reconnect this chat"
 msgstr "��ื�อม��อ�ารส���า�ี���ำ�ม�สำ�ร��"
 
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "�ม�รอ�รั��ำสั���ี�"
+#: ../libempathy-gtk/empathy-chat.c:621
+msgid "Failed to join chatroom"
+msgstr "���าห�อ�ส���า�ม�สำ�ร��"
+
+#: ../libempathy-gtk/empathy-chat.c:639
+msgid "Failed to open private chat"
+msgstr "��ิ��ารส���าส�ว��ัว�ม�สำ�ร��"
+
+#: ../libempathy-gtk/empathy-chat.c:678
+msgid "Topic not supported on this conversation"
+msgstr "�ม�รอ�รั��าร�ั��หัว��อ���ารส���า�ี�"
+
+#: ../libempathy-gtk/empathy-chat.c:684
+msgid "You are not allowed to change the topic"
+msgstr "�ุ��ม����รั�อ�ุ�า��ห���ลี�ย�หัว��อ���"
+
+#: ../libempathy-gtk/empathy-chat.c:802
+msgid "/clear, clear all messages from the current conversation"
+msgstr "/clear, ล�า���อ�วาม�ั��หม�ออ��า��ารส���า�ั��ุ�ั�"
+
+#: ../libempathy-gtk/empathy-chat.c:805
+msgid "/topic <topic>, set the topic of the current conversation"
+msgstr "/topic <หัว��อ>, �ั��หัว��อ�อ��ารส���า�ั��ุ�ั�"
+
+#: ../libempathy-gtk/empathy-chat.c:808
+msgid "/join <chatroom id>, join a new chatroom"
+msgstr "/join <�ื�อห�อ�ส���า>, ���าห�อ�ส���าห�อ��หม�"
+
+#: ../libempathy-gtk/empathy-chat.c:811
+msgid "/j <chatroom id>, join a new chatroom"
+msgstr "/j <�ื�อห�อ�ส���า>, ���าห�อ�ส���าห�อ��หม�"
+
+#: ../libempathy-gtk/empathy-chat.c:814
+msgid "/query <contact id> [<message>], open a private chat"
+msgstr "/query <�ื�อ�ู��ิ���อ> [<��อ�วาม>], ��ิ��ารส���าส�ว��ัว"
+
+#: ../libempathy-gtk/empathy-chat.c:817
+msgid "/msg <contact id> <message>, open a private chat"
+msgstr "/msg <�ื�อ�ู��ิ���อ> [<��อ�วาม>], ��ิ��ารส���าส�ว��ัว"
+
+#: ../libempathy-gtk/empathy-chat.c:820
+msgid "/nick <nickname>, change your nickname on current server"
+msgstr "/nick <�ื�อ�ล��>, ��ลี�ย��ื�อ�ล���อ��ุ�����ิร���วอร��ั��ุ�ั�"
+
+#: ../libempathy-gtk/empathy-chat.c:823
+msgid "/me <message>, send an ACTION message to the current conversation"
+msgstr "/me <��อ�วาม>, ส����อ�วาม ACTION (�าร�ระ�ำ���ั��ุ�ั�) ���า�����ารส���า�ั��ุ�ั�"
+
+#: ../libempathy-gtk/empathy-chat.c:826
+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 "
+"join a new chatroom\""
+msgstr ""
+"/say <��อ�วาม>, ส�� <��อ�วาม> ���า�����ารส���า�ั��ุ�ั� ���สำหรั�ส����อ�วาม�ี��ึ�������วย '/' "
+"�ัวอย�า����� \"/say /join ���สำหรั����าห�อ�ส���าห�อ��หม�\""
+
+#: ../libempathy-gtk/empathy-chat.c:831
+msgid ""
+"/help [<command>], show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr "/help [<�ำสั��>], �ส���ำสั���ั��หม��ี�รอ�รั� ��าระ�ุ <�ำสั��> ��วย ���ะ�ส��วิ�ี����ำสั���ั��"
+
+#: ../libempathy-gtk/empathy-chat.c:841
+#, c-format
+msgid "Usage: %s"
+msgstr "วิ�ี���: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:870
+msgid "Unknown command"
+msgstr "�ม�รู��ั��ำสั���ี�"
+
+#: ../libempathy-gtk/empathy-chat.c:991
+msgid "Unknown command, see /help for the available commands"
+msgstr "�ม�รู��ั��ำสั���ี� �ู�ำสั���ี�����������า� /help"
 
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:1130
 msgid "offline"
 msgstr "ออ��ล��"
 
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1133
 msgid "invalid contact"
 msgstr "��อมูล�ู��ิ���อ�ิ��ลา�"
 
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1136
 msgid "permission denied"
 msgstr "�ม����รั�อ�ุ�า�"
 
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1139
 msgid "too long message"
 msgstr "��อ�วามยาว��ิ���"
 
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1142
 msgid "not implemented"
 msgstr "ยั��ม��ำ"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1145
 msgid "unknown"
 msgstr "�ม��รา�"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1149
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะส����อ�วาม '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
 msgid "Topic set to: %s"
 msgstr "หัว��อ�ู��ั������: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1181
 msgid "No topic defined"
 msgstr "�ม�มี�าร�ำห��หัว��อ"
 
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1554
 msgid "(No Suggestions)"
 msgstr "(�ม�มี�ำ��ะ�ำ)"
 
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1608
 msgid "Insert Smiley"
 msgstr "��ร�รู�สีห��า"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-ui-utils.c:1657
 msgid "_Send"
 msgstr "_ส��"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1660
 msgid "_Spelling Suggestions"
 msgstr "�_�ะ�ำ�ัวสะ��"
 
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1775
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s �ั��าร��ื�อม��อ�ล�ว"
@@ -948,12 +1210,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:1184
+#: ../libempathy-gtk/empathy-chat.c:1782
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s �ู� %2$s ��ะออ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1785
 #, c-format
 msgid "%s was kicked"
 msgstr "%s �ู���ะออ�"
@@ -961,17 +1223,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:1195
+#: ../libempathy-gtk/empathy-chat.c:1793
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s �ู� %2$s ห�าม�ม��ห����า"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1796
 #, c-format
 msgid "%s was banned"
 msgstr "%s �ู�ห�าม�ม��ห����า"
 
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1800
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ออ��า�ห�อ�"
@@ -981,61 +1243,81 @@ msgstr "%s ออ��า�ห�อ�"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1809
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:1834
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ���ามา��ห�อ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1295
+#: ../libempathy-gtk/empathy-chat.c:1859
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s ��ลี�ย��ื�อ���� %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
 msgid "Disconnected"
 msgstr "�ั��าร��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2521
+msgid "Wrong password; please try again:"
+msgstr "รหัส��า��ม��ู���อ� �รุ�าลอ��หม�:"
+
+#: ../libempathy-gtk/empathy-chat.c:2522
+msgid "Retry"
+msgstr "ลอ��หม�"
+
+#: ../libempathy-gtk/empathy-chat.c:2527
+msgid "This room is protected by a password:"
+msgstr "ห�อ��ี����รหัส��า���อ��ั��ว�:"
+
+#: ../libempathy-gtk/empathy-chat.c:2528
+msgid "Join"
+msgstr "���าห�อ�"
+
+#: ../libempathy-gtk/empathy-chat.c:2668
 msgid "Connected"
 msgstr "��ื�อม��อ�ล�ว"
 
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2721
+#: ../libempathy-gtk/empathy-log-window.c:546
 msgid "Conversation"
 msgstr "�ารส���า"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:650
 msgid "Topic:"
 msgstr "หัว��อ:"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:317
+#: ../libempathy-gtk/empathy-theme-adium.c:817
 msgid "_Copy Link Address"
 msgstr "_�ั�ลอ��ี�อยู�ลิ���"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:824
 msgid "_Open Link"
 msgstr "_��ิ�ลิ���"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:422
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Ey"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "�������อมูล�ู��ิ���อ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
 msgid "Personal Information"
 msgstr "��อมูลส�ว��ุ��ล"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "�ู��ิ���อ�หม�"
 
@@ -1047,37 +1329,37 @@ msgstr "�ั�สิ���ภายห_ลั�"
 msgid "Subscription Request"
 msgstr "�อสมั�ร"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1557
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ยื�ยั��ี��ะล��ลุ�ม '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-list-view.c:1559
 msgid "Removing group"
 msgstr "�ำลั��ะล��ลุ�ม"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1463
-#: ../libempathy-gtk/empathy-contact-list-view.c:1540
+#: ../libempathy-gtk/empathy-contact-list-view.c:1606
+#: ../libempathy-gtk/empathy-contact-list-view.c:1683
 msgid "_Remove"
 msgstr "_ล�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1636
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ยื�ยั��ี��ะล��ู��ิ���อ '%s' หรือ�ม�?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
 msgid "Removing contact"
 msgstr "�ำลั��ะล��ู��ิ���อ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Add Contact..."
 msgstr "�_�ิ�ม�ู��ิ���อ..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "_ส���า"
 
@@ -1092,8 +1374,9 @@ msgid "_Video Call"
 msgstr "�รีย�สาย�ุย��วย_ภา��ละ�สีย�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "�ู�ารส���า��อ�ห_��า�ี�"
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "�ารส���า��อ�ห_��า�ี�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
@@ -1108,7 +1391,7 @@ msgid "Infor_mation"
 msgstr "_��อมูล"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "�_����"
 
@@ -1132,120 +1415,120 @@ msgstr "�ั��ึ�รู�����ัว"
 msgid "Unable to save avatar"
 msgstr "�ม�สามาร��ั��ึ�รู�����ัว"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
 msgid "Select"
 msgstr "�ลือ�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:1010
+#: ../src/empathy-main-window.c:1038
 msgid "Group"
 msgstr "�ลุ�ม"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1261
 msgid "Country ISO Code:"
 msgstr "รหัส ISO �อ��ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1263
 msgid "Country:"
 msgstr "�ระ��ศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1265
 msgid "State:"
 msgstr "รั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1267
 msgid "City:"
 msgstr "�มือ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1269
 msgid "Area:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1271
 msgid "Postal Code:"
 msgstr "รหัส��รษ�ีย�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1273
 msgid "Street:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1275
 msgid "Building:"
 msgstr "อา�าร:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1277
 msgid "Floor:"
 msgstr "�ั��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1279
 msgid "Room:"
 msgstr "ห�อ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1281
 msgid "Text:"
 msgstr "��อ�วาม:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1283
 msgid "Description:"
 msgstr "�ำ�รรยาย:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1285
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1287
 msgid "Accuracy Level:"
 msgstr "ระ�ั��วามละ�อีย�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1289
 msgid "Error:"
 msgstr "�วาม�ลา���ลื�อ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1291
 msgid "Vertical Error (meters):"
 msgstr "�วาม�ลา���ลื�อ���ว�ั�� (�ม�ร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1293
 msgid "Horizontal Error (meters):"
 msgstr "�วาม�ลา���ลื�อ���ว�อ� (�ม�ร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1295
 msgid "Speed:"
 msgstr "อั�รา�ร�ว:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1297
 msgid "Bearing:"
 msgstr "�ิศ�า�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1299
 msgid "Climb Speed:"
 msgstr "อั�รา�ร�ว���ระ�ั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1301
 msgid "Last Updated on:"
 msgstr "�รั���อมูลล�าสุ��มื�อ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1303
 msgid "Longitude:"
 msgstr "ลอ��ิ�ู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:1305
 msgid "Latitude:"
 msgstr "ละ�ิ�ู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:1307
 msgid "Altitude:"
 msgstr "ระ�ั��วามสู�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#: ../libempathy-gtk/empathy-contact-widget.c:1368
 msgid "<b>Location</b>"
 msgstr "<b>�ำ�ห����ี��ั��</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:1381
 msgid "<b>Location</b>, "
 msgstr "<b>�ำ�ห����ี��ั��</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:1431
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Ey �วลา %R UTC"
 
@@ -1270,7 +1553,7 @@ msgid "Client:"
 msgstr "��ร��รมลู���าย:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
+#: ../src/empathy-main-window.c:1021
 msgid "Contact"
 msgstr "�ู��ิ���อ"
 
@@ -1323,28 +1606,28 @@ msgstr "�ว������:"
 msgid "_Add Group"
 msgstr "�_�ิ�ม�ลุ�ม"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "��ิร���วอร��หม�"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "��ิร���วอร�"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "�อร��"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:302
+#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "�ั��ี"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:556
 msgid "Date"
 msgstr "วั��ี�"
 
@@ -1364,56 +1647,70 @@ msgstr "���หา"
 msgid "_For:"
 msgstr "_�ำว�า:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "�_รีย�สาย"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "�ื�อ�ระ�ำ�ัว�ู��ิ���อ:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
 msgid "C_hat"
 msgstr "_ส���า"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "�ื�อ�ระ�ำ�ัว�ู��ิ���อ:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
 msgid "New Conversation"
 msgstr "�ารส���า�หม�"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "ส��ภา�_วี�ิ�ัศ��"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "�_รีย�สาย"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "�าร�รีย�สาย�หม�"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message..."
 msgstr "��อ�วาม�ำห���อ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages..."
 msgstr "�������อ�วาม�ำห���อ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to remove this status as a favorite"
 msgstr "�ลิ���ื�อล�ส�า�ะ�ี�ออ��า�ส�า�ะ��ร�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:353
 msgid "Click to make this status a favorite"
 msgstr "�ลิ���ื�อ�ำ�ห�ส�า�ะ�ี�����ส�า�ะ��ร�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "�ำห��ส�า�ะ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:896
 msgid "Set your presence and current status"
 msgstr "�ำห��ส�า�ะอยู�/�ม�อยู��อ��ุ� �ละส�า�ะ�ั��ุ�ั�"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+#: ../libempathy-gtk/empathy-presence-chooser.c:1083
 msgid "Custom messages..."
 msgstr "��อ�วาม�ำห���อ�..."
 
@@ -1457,11 +1754,11 @@ msgstr "�าร�รีย�สายออ���ื�อส���า
 msgid "Voice call ended"
 msgstr "���ารส���า��วย�สีย�"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "��อ���อ�วาม�ำห���อ�"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "�������อ�วาม�ำห���อ�"
 
@@ -1489,15 +1786,15 @@ msgstr "สะอา�"
 msgid "Blue"
 msgstr "��ำ��ิ�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
+#: ../libempathy-gtk/empathy-ui-utils.c:1519
 msgid "Unable to open URI"
 msgstr "�ม�สามาร���ิ� URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1649
 msgid "Select a file"
 msgstr "�ลือ����ม"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
+#: ../libempathy-gtk/empathy-ui-utils.c:1709
 msgid "Select a destination"
 msgstr "�ลือ��ี������ลาย�า�"
 
@@ -1668,75 +1965,39 @@ msgstr "�ะวั���"
 msgid "Vietnamese"
 msgstr "�วีย��าม"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr "�ู��ิ���อ�ี��ะ�ส�����อ���ล�� ��า�ว��ว�า��ว� ���ะ�ม��ส���ู��ิ���อ�ลย"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "รู�����ัว�อ��ู��ิ���อ ��า�ว��ว�า��ว� ��หมาย�ึ��ู��ิ���อ�ม�มีรู�����ัว"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megaphone"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:522
-msgid "Talk!"
-msgstr "�ุย!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "�_�ี�ยว�ั�"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_��อมูล"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_�รั�����"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "�รุ�า�ั����า�ู��ิ���อ��วย"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The contact selected cannot receive files."
+msgstr "�ู��ิ���อ�ี��ลือ��ม�สามาร�รั����ม���"
 
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "�ลือ��ู��ิ���อ..."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The contact selected is offline."
+msgstr "�ู��ิ���อ�ี��ลือ�ออ��ล��อยู�"
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "ส�า�ะอยู�/�ม�อยู�"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "�ม�มีรายละ�อีย���อ�ิ��ลา�"
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "�ั����าส�า�ะอยู�/�ม�อยู��อ��ุ�"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "��อ�วาม�ั��� (Empathy)"
 
-#: ../src/empathy.c:742
+#: ../src/empathy.c:893
 msgid "Don't connect on startup"
 msgstr "�ม���อ���ื�อม��อ��ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:746
-msgid "Don't show the contact list on startup"
-msgstr "�ม���อ��ส��ราย�ื�อ�ู��ิ���อ��ะ�ริ�ม�ำ�า�"
+#: ../src/empathy.c:897
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "�ม���อ��ส��ราย�ื�อ�ู��ิ���อหรือ�ล�อ�����อ�อื������ะ�ริ�ม�ำ�า�"
 
-#: ../src/empathy.c:750
+#: ../src/empathy.c:901
 msgid "Show the accounts dialog"
 msgstr "�ส���ล�อ�����อ��ั��ี"
 
-#: ../src/empathy.c:762
+#: ../src/empathy.c:913
 msgid "- Empathy IM Client"
 msgstr "- ลู���าย IM Empathy"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:84
 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 "
@@ -1747,7 +2008,7 @@ msgstr ""
 "GNU General Public License �ี���ย��ร���ยมูล�ิ�ิ�อ����วร��สรี �ม�ว�า�ะ����สั��าอ�ุ�า�รุ���ี� 2 "
 "หรือรุ���ั�มา (�าม����ุ��ะ�ลือ�)"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:88
 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 "
@@ -1759,7 +2020,7 @@ msgstr ""
 "*�วาม�หมาะสมสำหรั�วั��ุ�ระส������าะ�ิ����* �รุ�าอ�า� GNU General Public License "
 "��ื�อ�ูรายละ�อีย���ิ�ม��ิม"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:92
 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 "
@@ -1769,11 +2030,11 @@ msgstr ""
 "�รุ�า�ิ���อ���ี� Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:120
 msgid "An Instant Messaging client for GNOME"
 msgstr "��ร��รมลู���าย��อ�วาม�ั���สำหรั� GNOME"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:126
 msgid "translator-credits"
 msgstr ""
 "����ิ�ั�ษ� �ารุ��ุ��า�ั���\n"
@@ -1820,37 +2081,37 @@ msgstr "��ิ���อ�ิ��ลา�"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1430
+#: ../src/empathy-account-assistant.c:331
+#: ../src/empathy-accounts-dialog.c:1507
 #, c-format
 msgid "New %s account"
 msgstr "�ั��ี %s �หม�"
 
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:403
 msgid "What kind of chat account do you have?"
 msgstr "�ุ�มี�ั��ีส���า��ิ��ห�?"
 
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:409
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "�ุ�มี�ั��ีส���าอื���ี���อ��าร�ั����าอี�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:415
 msgid "Enter your account details"
 msgstr "��อ�รายละ�อีย��อ��ั��ี�อ��ุ�"
 
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:420
 msgid "What kind of chat account do you want to create?"
 msgstr "�ุ���อ��ารสร�า��ั��ีส���า��ิ��ห�?"
 
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:426
 msgid "Do you want to create other chat accounts?"
 msgstr "�ุ���อ��าร��ิ�ม�ั��ีส���าอื��อี�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:433
 msgid "Enter the details for the new account"
 msgstr "��อ�รายละ�อีย��อ��ั��ี�หม��ี��ะสร�า�"
 
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:519
 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 "
@@ -1861,77 +2122,88 @@ msgstr ""
 "Talk, AIM, Windows Live �ละ��ร��รมส���าอื��� อี�มา�มาย �ละ��า����ม��ร���หรือ�ว����ม "
 "�ุ���ยั�สามาร��ู��ุย��วย�สีย�หรือภา������วย"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:536
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "�ุ�มี�ั��ี�ี�����ั���ร��รมส���าอื��อยู�หรือ�ม�?"
 
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:559
 msgid "Yes, import my account details from "
 msgstr "มี ��วย�ำ���า��อมูล�ั��ี�อ���า����า�า� "
 
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:580
 msgid "Yes, I'll enter my account details now"
 msgstr "มี ��า����า�ะ��อ���อมูล�ั��ี�อ���า����า��ี�ยว�ี�"
 
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:602
 msgid "No, I want a new account"
 msgstr "�ม�มี ��า����า��อ��ารสร�า��ั��ี�หม�"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:612
 msgid "No, I just want to see people online nearby for now"
 msgstr "�ม�มี ��า����า�����อ��าร�ู�ู����ี�ออ��ล��อยู���ล�� ����ั�����อ��ี�"
 
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:633
 msgid "Select the accounts you want to import:"
 msgstr "�ลือ��ั��ี�ี��ุ���อ��าร�ำ���า:"
 
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "���"
 
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:727
 msgid "No, that's all for now"
 msgstr "�ม� �อ����ั����อ�"
 
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:920
 msgid "Welcome to Empathy"
 msgstr "ยิ��ี��อ�รั�สู� Empathy"
 
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:929
 msgid "Import your existing accounts"
 msgstr "�ำ���า�ั��ี�อ��ุ��ี�มี"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:65
 #, c-format
 msgid "There are unsaved modification regarding your %s account."
 msgstr "มี��อมูล��ี�ยว�ั��ั��ี %s �อ��ุ��ี�ยั��ม�����ั��ึ�"
 
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
+#. 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
+msgid "Your new account has not been saved yet."
+msgstr "�ั��ี�หม��อ��ุ�ยั��ม�����ั��ึ�"
+
+#: ../src/empathy-accounts-dialog.c:231 ../src/empathy-call-window.c:729
+msgid "Connecting..."
+msgstr "�ำลั���ื�อม��อ..."
+
+#: ../src/empathy-accounts-dialog.c:258
 #, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s �ี� %2$s"
+msgid "Disconnected - %s"
+msgstr "�ั��าร��ื�อม��อ�ล�ว - %s"
 
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
+#: ../src/empathy-accounts-dialog.c:263
 #, c-format
-msgid "%s Account"
-msgstr "�ั��ี %s"
+msgid "Offline - %s"
+msgstr "ออ��ล�� - %s"
 
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "�ั��ี�หม�"
+#: ../src/empathy-accounts-dialog.c:276
+msgid "Offline - No Network Connection"
+msgstr "ออ��ล�� - �ม�มี�าร��ื�อม��อ��รือ��าย"
 
-#: ../src/empathy-accounts-dialog.c:516
+#: ../src/empathy-accounts-dialog.c:284
+msgid "Unknown Status"
+msgstr "�ม��รา�ส�า�ะ"
+
+#: ../src/empathy-accounts-dialog.c:295
+msgid "Offline - Account disabled"
+msgstr "ออ��ล�� - �ั��ี�ู�ระ�ั�"
+
+#: ../src/empathy-accounts-dialog.c:634
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1939,39 +2211,16 @@ msgstr ""
 "�ุ��ำลั��ะสร�า��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:802
-#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"�ุ��ำลั��ะล��ั��ี %s �อ��ุ�!\n"
-"ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
-
-#. Translators: this is used only when built on a moblin platform
-#: ../src/empathy-accounts-dialog.c:806
+#: ../src/empathy-accounts-dialog.c:924
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "�ุ���อ��ารล� %s ออ��า���รื�อ��อ��ุ�หรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:812
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"�ารส���า�ละห�อ�ส���า��� �ี���ี�ยว��อ��ะ *�ม�* �ู�ล����าร�ำ��ิ��าร��อ\n"
-"\n"
-"��า�ุ���ิ�ม�ั��ี�ี��ลั����ามา��ภายหลั� ��อมูล�ั��ล�าว��ยั����ำ�ลั�มา������"
-
-#. Translators: this is used only when built on a moblin platform
-#: ../src/empathy-accounts-dialog.c:819
+#: ../src/empathy-accounts-dialog.c:928
 msgid "This will not remove your account on the server."
 msgstr "�ารล��ี��ะ�ม�ล��ั��ี�อ��ุ��ี���ิร���วอร�"
 
-#: ../src/empathy-accounts-dialog.c:1010
+#: ../src/empathy-accounts-dialog.c:1110
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1979,7 +2228,7 @@ msgstr ""
 "�ุ��ำลั��ะ�ลือ��ั��ี�หม� �ึ���ะละ�ิ���าร��ลี�ย���ล���า�� �ี��ุ��ำมา\n"
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
-#: ../src/empathy-accounts-dialog.c:1507
+#: ../src/empathy-accounts-dialog.c:1593
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1988,7 +2237,7 @@ msgstr ""
 "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
 
 #.  Translators: this is used only when built on a moblin platform 
-#: ../src/empathy-accounts-dialog.c:1673
+#: ../src/empathy-accounts-dialog.c:1768
 msgid "_Next"
 msgstr "_�ั���"
 
@@ -2024,103 +2273,226 @@ msgid "_Create a new account"
 msgstr "_สร�า��ั��ี�หม�"
 
 #: ../src/empathy-accounts-dialog.ui.h:8
+msgid "_Import..."
+msgstr "_�ำ���า..."
+
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "_Reuse an existing account"
 msgstr "�ำ�ั��ี�ี�มีอยู��ลั�มา�_���หม�"
 
 # This is part of "Add new <type> account" message
-#: ../src/empathy-accounts-dialog.ui.h:9
+#: ../src/empathy-accounts-dialog.ui.h:10
 msgid "account"
 msgstr "�หม�"
 
-#: ../src/empathy-call-window.c:427
+#: ../src/empathy-call-window.c:453
 msgid "Contrast"
 msgstr "�วาม��า�ระ�ั�สี"
 
-#: ../src/empathy-call-window.c:430
+#: ../src/empathy-call-window.c:456
 msgid "Brightness"
 msgstr "�วามสว�า�"
 
-#: ../src/empathy-call-window.c:433
+#: ../src/empathy-call-window.c:459
 msgid "Gamma"
 msgstr "��มมา"
 
-#: ../src/empathy-call-window.c:541
+#: ../src/empathy-call-window.c:567
 msgid "Volume"
 msgstr "�วาม�ั�"
 
-#: ../src/empathy-call-window.c:674
-msgid "Connecting..."
-msgstr "�ำลั���ื�อม��อ..."
-
-#: ../src/empathy-call-window.c:781
+#: ../src/empathy-call-window.c:1022
 msgid "_Sidebar"
 msgstr "���_��า�"
 
-#: ../src/empathy-call-window.c:800
+#: ../src/empathy-call-window.c:1041
 msgid "Dialpad"
 msgstr "������รศั���"
 
-#: ../src/empathy-call-window.c:806
+#: ../src/empathy-call-window.c:1047
 msgid "Audio input"
 msgstr "�สีย����า"
 
-#: ../src/empathy-call-window.c:810
+#: ../src/empathy-call-window.c:1051
 msgid "Video input"
 msgstr "ภา����า"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:873
+#: ../src/empathy-call-window.c:1116
 #, c-format
 msgid "Call with %s"
 msgstr "�าร�ุยสาย�ั� %s"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:954
+#: ../src/empathy-call-window.c:1197
 msgid "Call"
 msgstr "�าร�ุยสาย"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-call-window.c:1700
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "à¹?à¸?ืà¹?อมà¸?à¹?อà¹?ลà¹?ว â?? %d:%02dm"
 
+#: ../src/empathy-call-window.c:1761
+msgid "Technical Details"
+msgstr "รายละ�อีย��า�����ิ�"
+
+#: ../src/empathy-call-window.c:1799
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "�อ����วร��อ� %s �ม�รู��ั��อร��ม��สีย���� �ลย�ี��อม�ิว��อร��อ��ุ�รอ�รั�"
+
+#: ../src/empathy-call-window.c:1804
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "�อ����วร��อ� %s �ม�รู��ั��อร��ม�วี�ิ�ัศ����� �ลย�ี��อม�ิว��อร��อ��ุ�รอ�รั�"
+
+#: ../src/empathy-call-window.c:1810
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"�ม�สามาร���ื�อม��อ��ยั� %s ��� ��าย����ายห�ึ��อา�อยู�����รือ��าย�ี��ม�อ�ุ�า��ห���ื�อม��อ��ย�ร�"
+
+#: ../src/empathy-call-window.c:1816
+msgid "There was a failure on the network"
+msgstr "��ิ��วามล�ม�หลว����รือ��าย"
+
+#: ../src/empathy-call-window.c:1820
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"�ารรอ�รั��อร��ม��สีย��ี��ำ������อ�������าร�รีย�สาย�ี� ยั��ม�����ิ��ั��ล����อม�ิว��อร��อ��ุ�"
+
+#: ../src/empathy-call-window.c:1823
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"�ารรอ�รั��อร��ม�วี�ิ�ัศ���ี��ำ������อ�������าร�รีย�สาย�ี� ยั��ม�����ิ��ั��ล����อม�ิว��อร��อ��ุ�"
+
+#: ../src/empathy-call-window.c:1833
+#, c-format
+msgid ""
+"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"��ิ�สิ���ม��า��ิ���อ����ระ�อ� Telepathy  �รุ�า <a href=\"%s\">ราย�า��ั���ี�</a> "
+"�ร�อม����ูม�ี�����า�ห��า��า� '�ี�ั��' ���ม�ูวิ�ี�������วย"
+
+#: ../src/empathy-call-window.c:1841
+msgid "There was a failure in the call engine"
+msgstr "��ิ��วามล�ม�หลว���ล���าร�รีย�สาย"
+
+#: ../src/empathy-call-window.c:1880
+msgid "Can't establish audio stream"
+msgstr "�ม�สามาร���ื�อม��อส�รีม�สีย����"
+
+#: ../src/empathy-call-window.c:1890
+msgid "Can't establish video stream"
+msgstr "�ม�สามาร���ื�อม��อส�รีมวี�ิ�ัศ�����"
+
 #: ../src/empathy-call-window.ui.h:1
+msgid "Call the contact again"
+msgstr "�รีย��ู��ิ���ออี��รั��"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "�ิ��ล�อ�"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "��ิ��ล�อ�"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "�ิ��ล�อ��ละหยุ�ส��วี�ิ�ัศ��"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "��ิ��ล�อ��ละส��วี�ิ�ัศ��"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "��ิ��ล�อ�����ม���อ�ส��วี�ิ�ัศ��"
+
+#: ../src/empathy-call-window.ui.h:7
 msgid "Hang up"
 msgstr "วา�สาย"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "วา�สาย�ั��ุ�ั�"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "�ส���ัวอย�า�"
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Redial"
 msgstr "�รีย���ำ"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
 msgid "Send Audio"
 msgstr "ส��สั��า��สีย�"
 
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "ส��ภา�วี�ิ�ัศ��"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "��ิ�-�ิ��ารส��สั��า��สีย�"
 
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "�ส���ัวอย�า�วี�ิ�ัศ��"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "_วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "�_รีย�สาย"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "�ิ�วี�ิ�ัศ��"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "��ิ�วี�ิ�ัศ��"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
+msgstr "�ส���ัวอย�า�วี�ิ�ัศ��"
+
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "มุ_มมอ�"
 
-#: ../src/empathy-chat-window.c:349
+#: ../src/empathy-chat-window.c:408 ../src/empathy-chat-window.c:428
 #, c-format
-msgid "Conversations (%d)"
-msgstr "�ารส���า (%d)"
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม)"
 
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:420
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (�ละอี� %u ��)"
+
+#: ../src/empathy-chat-window.c:436
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม�า���อื��)"
+
+#: ../src/empathy-chat-window.c:445
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (ยั��ม�อ�า� %d ��อ�วาม�า��ุ���)"
+
+#: ../src/empathy-chat-window.c:654
 msgid "Typing a message."
 msgstr "�ำลั��ิม����อ�วาม"
 
@@ -2129,28 +2501,28 @@ msgid "C_lear"
 msgstr "_ล�า�"
 
 #: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "�ู�_�ิ���อ"
+
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "�ารส���า"
 
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "��ร�รู�_สีห��า"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Left"
 msgstr "ย�าย�������า�_��าย"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Right"
 msgstr "ย�าย�������า�_�วา"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "�ู�_�ิ���อ"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
-msgstr "��ื�อ_หา"
+msgstr "_สาร�ั�"
 
 #: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
@@ -2164,7 +2536,7 @@ msgstr "_�ึ�����ออ�"
 msgid "_Favorite Chatroom"
 msgstr "_ห�อ�ส���า��ร�"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "_วิ�ี���"
 
@@ -2176,7 +2548,7 @@ msgstr "����_�ั���"
 msgid "_Previous Tab"
 msgstr "����_��อ�ห��า"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "�_ส��ราย�ื�อ�ู��ิ���อ"
 
@@ -2184,15 +2556,15 @@ msgstr "�_ส��ราย�ื�อ�ู��ิ���อ"
 msgid "_Tabs"
 msgstr "�_���"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
 msgid "Name"
 msgstr "�ื�อ"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
 msgid "Room"
 msgstr "ห�อ�"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
 msgid "Auto-Connect"
 msgstr "��ื�อม��ออั���มั�ิ"
 
@@ -2200,75 +2572,89 @@ msgstr "��ื�อม��ออั���มั�ิ"
 msgid "Manage Favorite Rooms"
 msgstr "�ั��ารห�อ���ร�"
 
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:345
+msgid "Incoming video call"
+msgstr "�าร�รีย����า��ื�อส���า��วยวี�ิ�ัศ��"
+
+#: ../src/empathy-event-manager.c:345
 msgid "Incoming call"
 msgstr "�าร�รีย����า"
 
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:349
+#, c-format
+msgid "%s is video calling you, do you want to answer?"
+msgstr "%s �ำลั��รีย�สาย�ุ�อยู� ��ื�อส���า��วยวี�ิ�ัศ�� �ุ���อ��าร�ะ�อ�รั�หรือ�ม�?"
+
+#: ../src/empathy-event-manager.c:350
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s �ำลั��รีย�สาย�ุ�อยู� �ุ���อ��าร�ะ�อ�รั�หรือ�ม�?"
 
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:372
 msgid "_Reject"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:378
 msgid "_Answer"
 msgstr "_�อ�รั�"
 
-#: ../src/empathy-event-manager.c:446
+#: ../src/empathy-event-manager.c:495
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "�าร�รีย����า��วยวี�ิ�ัศ���า� %s"
+
+#: ../src/empathy-event-manager.c:495
 #, c-format
 msgid "Incoming call from %s"
 msgstr "�าร�รีย����า�า� %s"
 
-#: ../src/empathy-event-manager.c:490
+#: ../src/empathy-event-manager.c:541
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s ส���ำ��ิ��ึ��ุ�"
 
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:547
 msgid "An external application will be started to handle it."
 msgstr "�ะ�รีย���ร��รมภาย�อ���ื�อ�ั��าร�ำ��ิ��ี�"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:552
 msgid "You don't have the needed external application to handle it."
 msgstr "����ุ��ม�มี��ร��รมภาย�อ��ี��ะ�ั��าร�ำ��ิ��ี�"
 
-#: ../src/empathy-event-manager.c:628
+#: ../src/empathy-event-manager.c:680
 msgid "Room invitation"
 msgstr "�ำ��ิ�สู�ห�อ�ส���า"
 
-#: ../src/empathy-event-manager.c:631
+#: ../src/empathy-event-manager.c:683
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ��ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#: ../src/empathy-event-manager.c:639
+#: ../src/empathy-event-manager.c:691
 msgid "_Decline"
 msgstr "_��ิ�ส�"
 
-#: ../src/empathy-event-manager.c:644
+#: ../src/empathy-event-manager.c:696
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "�_��าห�อ�"
 
-#: ../src/empathy-event-manager.c:683
+#: ../src/empathy-event-manager.c:735
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s �����ิ��ุ����าร�วมส���า�ี�ห�อ� %s"
 
-#: ../src/empathy-event-manager.c:709
+#: ../src/empathy-event-manager.c:761
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "�าร��า��อ����ม���า�า� %s"
 
-#: ../src/empathy-event-manager.c:889
+#: ../src/empathy-event-manager.c:941
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "มี�าร�อสมั�ร�า� %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid ""
 "\n"
@@ -2278,117 +2664,117 @@ msgstr ""
 "��อ�วาม: %s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:929
+#: ../src/empathy-event-manager.c:985
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ออ��ล���ล�ว"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:1001
 #, c-format
 msgid "%s is now online."
 msgstr "%s ออ��ล���ล�ว"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:100
 #, 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:104
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�ม��รา�"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s �า� %s �ี� %s/s"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
 #, 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:307
+#: ../src/empathy-ft-manager.c:306
 #, 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:310
+#: ../src/empathy-ft-manager.c:309
 #, 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:340
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "��ิ���อ�ิ��ลา���ะรั� \"%s\" �า� %s"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "��ิ���อ�ิ��ลา���ะรั����ม"
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "��ิ���อ�ิ��ลา���ะส�� \"%s\" �ห��ั� %s"
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "��ิ���อ�ิ��ลา���ะส�����ม"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
 #, 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:495
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ส�� \"%s\" �ห��ั� %s �รีย�ร�อย"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "��าย�อ����ม�สร��สม�ูร��"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
 msgid "Waiting for the other participant's response"
 msgstr "�ำลั�รอ�ห�อี���ายห�ึ���อ��ลั�"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "�ำลั��รว�สอ��วาม�ร���ว��อ� \"%s\""
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "�ำลั��ำ�ว��ฮ��อ� \"%s\""
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
 msgid "File"
 msgstr "���ม"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
 msgid "Remaining"
 msgstr "�หลืออี�"
 
@@ -2411,15 +2797,15 @@ msgid "Import Accounts"
 msgstr "�ำ���า�ั��ี"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:282
+#: ../src/empathy-import-widget.c:290
 msgid "Import"
 msgstr "�ำ���า"
 
-#: ../src/empathy-import-widget.c:291
+#: ../src/empathy-import-widget.c:299
 msgid "Protocol"
 msgstr "��ร���อล"
 
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:323
 msgid "Source"
 msgstr "�หล����อมูล"
 
@@ -2428,67 +2814,19 @@ msgstr "�หล����อมูล"
 msgid "%s account"
 msgstr "�ั��ี %s"
 
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "�_�����ั��ี"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "�ม�มี�ารระ�ุสา�ห�ุ��อ�ิ��ลา�"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "��อ�ิ��ลา���ี�ยว�ั���รือ��าย"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "�ารยื�ยั��ัว�ุ��ล�ม���า�"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "��อ�ิ��ลา���ี�ยว�ั��าร���ารหัสลั�"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "�ื�อ�ู����อยู�"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "�ม�มี��รั�รอ�"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "�ม���ื�อ�ือ��รั�รอ�"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "��รั�รอ�หม�อายุ�ล�ว"
+#: ../src/empathy-main-window.c:431
+msgid "Reconnect"
+msgstr "��ื�อม��อ�หม�"
 
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "��รั�รอ�ยั��ม�มี�าร�ริ�ม���"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "�ื�อ�ฮส������รั�รอ��ม��ร��ั�"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "ลาย�ิ�วมือ����รั�รอ��ม��ร��ั�"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "��รั�รอ�����รั�รอ��ัว�อ�"
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "��อ�ิ��ลา���ี�ยว�ั���รั�รอ�"
+#: ../src/empathy-main-window.c:438
+msgid "Edit Account"
+msgstr "������ั��ี"
 
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "�ิ�"
 
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1331
 msgid "Show and edit accounts"
 msgstr "�ส���ละ������ั��ี��า��"
 
@@ -2516,67 +2854,75 @@ msgstr "�ั��ารห�อ���ร�"
 msgid "N_ormal Size"
 msgstr "��า�_���ิ"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call..."
+msgstr "_สาย�หม�..."
+
+#: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "��า����ิ�ร�อมรู��_���ัว"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
+msgid "P_references"
+msgstr "_�รั�����"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "Show P_rotocols"
+msgstr "�ส���_�ร���อล"
+
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
 msgstr "�รีย��าม_�ื�อ"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
 msgid "Sort by _Status"
 msgstr "�รีย��าม_ส�า�ะ"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Accounts"
 msgstr "_�ั��ี"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "��า�_�ะ�ั�รั�"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "_�ี�ั��"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "�าร_��าย�อ����ม"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Join..."
 msgstr "�_��าห�อ�..."
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation..."
 msgstr "�ารส���า�_หม�..."
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "�ู��ิ���อ�ี�_ออ��ล��"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "_��อมูลส�ว��ุ��ล"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "�ารส���า��อ�ห_��า�ี�"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "_ห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
 msgid "Chat Room"
 msgstr "ห�อ�ส���า"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
 msgid "Members"
 msgstr "สมา�ิ�"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:539
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2592,16 +2938,16 @@ msgstr ""
 "��อ����รหัส��า�: %s\n"
 "สมา�ิ�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "No"
 msgstr "�ม����"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
 msgid "Could not start room listing"
 msgstr "�ม�สามาร��ริ�ม�ส��ราย�ื�อห�อ�"
 
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
 msgid "Could not stop room listing"
 msgstr "�ม�สามาร�หยุ��ส��ราย�ื�อห�อ�"
 
@@ -2665,86 +3011,74 @@ msgid "Language"
 msgstr "ภาษา"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "อ�ุ�า��ห������อมูล _GPS"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "อ�ุ�า��ห������อมูล��รศั���_มือ�ือ"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "อ�ุ�า��ห������อมูล�_�รือ��าย"
-
-#: ../src/empathy-preferences.ui.h:4
 msgid "Appearance"
 msgstr "ห��า�า"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
 msgid "Automatically _connect on startup "
 msgstr "��ื�อม_��อ��ยอั���มั�ิ�มื�อ�ริ�ม�ำ�า�"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "�ฤ�ิ�รรม"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
 msgid "Chat Th_eme:"
 msgstr "�ุ�_������ห��า��า�ส���า:"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable notifications when _away or busy"
 msgstr "�ิ��าร�����ห�ุ�มื�อ�_ม�อยู�หรือ�ม�ว�า�"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable sounds when _away or busy"
 msgstr "�ิ��าร����สีย��มื�อ�_ม�อยู�หรือ�ม�ว�า�"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "��ิ�����าร�����ห�ุ�มื�อ�ู��ิ���อ_ออ��ล��"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "��ิ�����าร�����ห�ุ�มื�อ�ู��ิ���อออ_��ล��"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "��ิ�����าร�����ห�ุ�มื�อห��า��า�_ส���า�ม�������ัส"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
 msgstr "��ิ�����าร�รว��ัวสะ��สำหรั�ภาษา:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "�ั�ว��"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "��า�ั����าะ�สภูมิศาส�ร�"
-
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "�ำ�ห����ี��ั��"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "�หล����อมูล�ำ�ห����ี��ั��:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Notifications"
 msgstr "�าร�����ห�ุ"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
 msgid "Play sound for events"
 msgstr "�ล���สีย�สำหรั��ห�ุ�าร����า��"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
 msgid "Preferences"
 msgstr "�รั�����"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "�วาม����ส�ว��ัว"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../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 "
@@ -2753,40 +3087,52 @@ msgstr ""
 "�วามละ�อีย��อ��ำ�ห����ี��ั���ี�ล�ล� �ะหมาย�ึ��าร�ม��ระ�าศ��อมูล�ี�ละ�อีย����ว�า�มือ� รั� "
 "�ละ�ระ��ศ�ี��ุ�อยู� �ิ�ั��า� GPS �ะละ�อีย��ึ��ศ�ิยมห�ึ���ำ�ห���"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "�ส��รู�_สีห��า���รู�ภา�"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "�ส��_ราย�ื�อ�ู��ิ���อ��ห�อ���า��"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "�สีย�"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "�าร�รว��ัวสะ��"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../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:27
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "�ุ�������"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "�_�รศั���มือ�ือ"
+
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Enable bubble notifications"
 msgstr "�_�ิ�����รอ��ำ�ู������ห�ุ"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable sound notifications"
 msgstr "�_�ิ�����าร�����ห�ุ��วย�สีย�"
 
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wifi)"
+msgstr "�_�รือ��าย (IP, Wifi)"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_��ิ��ารส���า�หม���ห��า��า��ย�"
@@ -2799,15 +3145,15 @@ msgstr "_�ระ�าศ�ำ�ห����ี��ั����ย
 msgid "_Reduce location accuracy"
 msgstr "_ล��วามละ�อีย��อ��ำ�ห����ี��ั��"
 
-#: ../src/empathy-status-icon.c:175
+#: ../src/empathy-status-icon.c:179
 msgid "Respond"
 msgstr "�อ�รั�"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ส�า�ะ"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "_ออ�"
 
@@ -2827,69 +3173,150 @@ msgstr "�ุ����รั��ำ��ิ�สำหรั��ริ
 msgid "Contact Map View"
 msgstr "����ี��ู��ิ���อ"
 
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "��อ�ิ��ลา�"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "วิ�ฤ�ิ"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "�ำ��ือ�"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "��อ�วาม"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "��อมูล"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "�ี�ั��"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1063
 msgid "Save"
 msgstr "�ั��ึ�"
 
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1185
 msgid "Debug Window"
 msgstr "ห��า��า��ี�ั��"
 
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1265
 msgid "Pause"
 msgstr "�ั�"
 
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1277
 msgid "Level "
 msgstr "ระ�ั� "
 
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1297
+msgid "Debug"
+msgstr "�ี�ั��"
+
+#: ../src/empathy-debug-window.c:1303
+msgid "Info"
+msgstr "��อมูล"
+
+#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+msgid "Message"
+msgstr "��อ�วาม"
+
+#: ../src/empathy-debug-window.c:1315
+msgid "Warning"
+msgstr "�ำ��ือ�"
+
+#: ../src/empathy-debug-window.c:1321
+msgid "Critical"
+msgstr "วิ�ฤ�ิ"
+
+#: ../src/empathy-debug-window.c:1327
+msgid "Error"
+msgstr "��อ�ิ��ลา�"
+
+#: ../src/empathy-debug-window.c:1346
 msgid "Time"
 msgstr "�วลา"
 
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1349
 msgid "Domain"
 msgstr "���ม�"
 
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1351
 msgid "Category"
 msgstr "หมว�"
 
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1353
 msgid "Level"
 msgstr "ระ�ั�"
 
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1385
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "��รื�อ�มือ�ั��าร�าร��ื�อม��อ�ี��ลือ��ม�รอ�รั�ส�ว��ยายสำหรั��ี�ั��ระยะ��ล"
 
+#~ msgid "Can't set an empty display name"
+#~ msgstr "�ม�สามาร��ำห���ื�อ�ส���ล�����ื�อว�า���ล�า���"
+
+#~ msgid "Unsupported command"
+#~ msgstr "�ม�รอ�รั��ำสั���ี�"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "�ู�ารส���า��อ�ห_��า�ี�"
+
+#~ msgid "C_all"
+#~ msgstr "�_รีย�สาย"
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr "�ู��ิ���อ�ี��ะ�ส�����อ���ล�� ��า�ว��ว�า��ว� ���ะ�ม��ส���ู��ิ���อ�ลย"
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "รู�����ัว�อ��ู��ิ���อ ��า�ว��ว�า��ว� ��หมาย�ึ��ู��ิ���อ�ม�มีรู�����ัว"
+
+#~ msgid "Talk!"
+#~ msgstr "�ุย!"
+
+#~ msgid "_Information"
+#~ msgstr "_��อมูล"
+
+#~ msgid "_Preferences"
+#~ msgstr "_�รั�����"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "�รุ�า�ั����า�ู��ิ���อ��วย"
+
+#~ msgid "Select contact..."
+#~ msgstr "�ลือ��ู��ิ���อ..."
+
+#~ msgid "Presence"
+#~ msgstr "ส�า�ะอยู�/�ม�อยู�"
+
+#~ msgid "Set your own presence"
+#~ msgstr "�ั����าส�า�ะอยู�/�ม�อยู��อ��ุ�"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "�ุ��ำลั��ะล��ั��ี %s �อ��ุ�!\n"
+#~ "ยื�ยั��ี��ะ�ำ��ิ��าร��อหรือ�ม�?"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "�ารส���า�ละห�อ�ส���า��� �ี���ี�ยว��อ��ะ *�ม�* �ู�ล����าร�ำ��ิ��าร��อ\n"
+#~ "\n"
+#~ "��า�ุ���ิ�ม�ั��ี�ี��ลั����ามา��ภายหลั� ��อมูล�ั��ล�าว��ยั����ำ�ลั�มา������"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "�ารส���า (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "�ู�_�ิ���อ"
+
+#~ msgid "No error specified"
+#~ msgstr "�ม�มี�ารระ�ุสา�ห�ุ��อ�ิ��ลา�"
+
+#~ msgid "Unknown error"
+#~ msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "อ�ุ�า��ห������อมูล _GPS"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "อ�ุ�า��ห������อมูล��รศั���_มือ�ือ"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "อ�ุ�า��ห������อมูล�_�รือ��าย"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "��า�ั����าะ�สภูมิศาส�ร�"
+
 #~ msgid "Empathy Instant Messenger"
 #~ msgstr "Empathy: ��ร��รม��อ�วาม�ั���"
 
@@ -2950,9 +3377,6 @@ msgstr "��รื�อ�มือ�ั��าร�าร��ื�อ
 #~ msgid "<b>New Account</b>"
 #~ msgstr "<b>�ั��ี�หม�</b>"
 
-#~ msgid "<b>Settings</b>"
-#~ msgstr "<b>��า�ั��</b>"
-
 #~ msgid "Import Accounts..."
 #~ msgstr "�ำ���า�ั��ี..."
 
@@ -3024,9 +3448,6 @@ msgstr "��รื�อ�มือ�ั��าร�าร��ื�อ
 #~ msgid "Browse:"
 #~ msgstr "�รีย��ู:"
 
-#~ msgid "Join"
-#~ msgstr "�_��าห�อ�"
-
 #~ msgid "Join New"
 #~ msgstr "���าห�อ��หม�"
 
@@ -3055,9 +3476,6 @@ msgstr "��รื�อ�มือ�ั��าร�าร��ื�อ
 #~ msgid "Enable sound when busy"
 #~ msgstr "��ิ�����สีย��มื�อ�ม�ว�า�"
 
-#~ msgid "Closed"
-#~ msgstr "�ิ��ล�ว"
-
 #~ msgid "End this call?"
 #~ msgstr "���าร�รีย��ี�หรือ�ม�?"