[empathy] po/vi: imported from Damned Lies



commit 17568394a41935c8f6f5c5a2d51f82a4d050441c
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date:   Wed Aug 22 14:07:47 2012 +0700

    po/vi: imported from Damned Lies

 po/vi.po | 3767 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1881 insertions(+), 1886 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index c9b7e19..f9032a5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,10 +9,11 @@ msgstr ""
 "Project-Id-Version: empathy TRUNK\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-03-16 10:47+0000\n"
-"PO-Revision-Date: 2012-03-22 09:11+0700\n"
+"POT-Creation-Date: 2012-08-20 16:02+0000\n"
+"PO-Revision-Date: 2012-08-22 14:07+0700\n"
 "Last-Translator: Nguyán ThÃi Ngác Duy <pclouds gmail com>\n"
 "Language-Team: Vietnamese <vi-VN googlegroups com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,60 +37,51 @@ msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 "Trà chuyán qua Google Talk, Facebook, MSN và nhiáu dách vá tÆÆng tá khÃc"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2512
-msgid "Messaging and VoIP Accounts"
-msgstr "TÃi khoán tin nhán và VoIP"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Quán là tÃi khoán tin nhán và VoIP"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "NÃn dÃng trÃnh quán là kát nái"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "Bát/tát sá dáng trÃnh quán là kát nái Äá tá Äáng ngát/tÃi kát nái."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
 msgstr "TrÃnh Empathy nÃn tá Äáng kát nái khi khái cháy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Empathy cà nÃn tá Äáng ÄÄng nháp vÃo cÃc tÃi khoán cáa bán vÃo lÃc khái cháy "
 "hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy nÃn tá Äáng Äát váng mát khi khÃng hoát Äáng"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Empathy cà nÃn tá Äáng ÄÄng nháp vÃo cÃc tÃi khoán cáa bán vÃo lÃc khái cháy "
 "hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
 msgstr "ThÆ mác tái vá mác Äánh Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
 msgid "The default folder to save file transfers in."
 msgstr "ThÆ mác mác Äánh vÃo ÄÃ cán lÆu táp tin ÄÆác truyán Äán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr "Sá ma thuát, dÃng Äá kiám tra xem cà cán thác hián dán dáp khÃng"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 msgid ""
 "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
 "should be executed or not. Users should not change this key manually."
@@ -97,78 +89,52 @@ msgstr ""
 "empathy-sanity-cleaning.c dÃng sá nÃy Äá kiám tra cà cán thác hián dán dáp "
 "khÃng. NgÆái dÃng khÃng nÃn thay Äái tham sá nÃy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "Hián liÃn lác ngoái tuyán"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Bát/tát hián danh sÃch ngoái tuyán trong danh sÃch liÃn lác."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Show avatars"
-msgstr "Hián ánh Äái dián"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Bát/tát hián thá ánh riÃng cho liÃn lác trong danh sÃch liÃn lác và cáa sá "
-"trà chuyán."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Show protocols"
-msgstr "Hián giao thác"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Bát/tát hián thá giao thác trong danh sÃch liÃn lác."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 msgid "Show Balance in contact list"
 msgstr "Hián sá dÆ tÃi khoán trong danh sÃch liÃn lác"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
 msgid "Whether to show account balances in the contact list."
 msgstr "Chán cà hián sá dÆ tÃi khoán trong danh sÃch liÃn lác hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Compact contact list"
-msgstr "Co lái danh sÃch liÃn há"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Whether to show the contact list in compact mode."
-msgstr "Bát/tát danh sÃch liÃn lác á chá Äá tÃm gán."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "án cáa sá chÃnh"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "án cáa sá chÃnh."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "ThÆ mác mác Äánh Äá chán ánh Äái dián"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ThÆ mác cháa ánh Äái dián lán trÆác."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "Má mái cuác trà chuyán mái trong cáa sá riÃng"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
 msgid "Always open a separate chat window for new chats."
 msgstr "LuÃn má mát cáa sá riÃng cho mái cuác trà chuyán mái."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "Hián sá kián Äán trong vÃng tráng thÃi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -176,135 +142,116 @@ msgstr ""
 "Hián sá kián Äán trong vÃng tráng thÃi. Náu Äá false, hián cho ngÆái dÃng "
 "ngay láp tác."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
 msgstr "Vá trà khung cáa sá tÃn gáu á bÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Vá trà ÄÆác lÆu (theo Äiám ánh) cáa khung cáa sá tÃn gáu á bÃn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-#| msgid "Show contact list in rooms"
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 msgid "Show contact groups"
 msgstr "Hián nhÃm liÃn lác"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-#| msgid "Whether to show account balances in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
 msgid "Whether to show groups in the contact list."
 msgstr "Chán cà hián nhÃm trong danh sÃch liÃn lác hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Contact list sort criterion"
-msgstr "TiÃu chuán sáp xáp danh sÃch liÃn lác"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-#| 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 the contact list by state."
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's state with the value \"state\". A value of \"name\" will sort "
-"the contact list by name."
-msgstr ""
-"TiÃu chuán nÃo cán dÃng khi sáp xáp danh sÃch liÃn lác. Mác Äánh là sáp theo "
-"\"state\" (tráng thÃi).  Già trá là \"name\" (tÃn) sáp thá tá theo tÃn."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "DÃng Ãm thanh thÃng bÃo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
 msgid "Whether to play a sound to notify of events."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi sá kián xáy ra hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "Tát Ãm thanh khi váng mát"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Bát/tát phÃt Ãm thanh thÃng bÃo khi váng mát hoác bán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "PhÃt Ãm thanh khi nhán tin nhán"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi nhán ÄÆác tin nhán hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "PhÃt Ãm thanh khi gái tin nhán"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi gái tin nhán hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "PhÃt Ãm thanh khi bát Äáu cuác trà chuyán mái"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Cà nÃn phÃt Ãm thanh bÃo khi nhán ÄÆác cuác trà chuyán mái hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "PhÃt Ãm thanh khi mát liÃn lác ÄÄng nháp"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi liÃn lác ÄÄng nháp vÃo máng hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "PhÃt Ãm thanh khi mát liÃn lác ÄÄng xuát"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi liÃn lác ÄÄng xuát ra máng hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "PhÃt Ãm thanh khi chÃnh bán ÄÄng nháp"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
 msgid "Whether to play a sound when logging into a network."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi ÄÄng nháp vÃo mát máng hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "PhÃt Ãm thanh khi chÃnh bán ÄÄng xuát"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
 msgid "Whether to play a sound when logging out of a network."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi ÄÄng xuát ra mát máng hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "Tá má thÃng bÃo vá tin nhán mái"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi nhán ÄÆác mát tin nhán mái hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "KhÃng tá má thÃng bÃo khi váng mát"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
 msgid "Whether to show popup notifications when away or busy."
 msgstr "CÃ nÃn phÃt Ãm thanh bÃo khi váng mát/bán hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Tá má thÃng bÃo náu cáa sá trà chuyán khÃng cà tiÃu Äiám"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -312,79 +259,83 @@ msgstr ""
 "CÃ nÃn hián thá hay khÃng mát thÃng bÃo tá má khi nhán mát tin nhán mái, "
 "ngay cá náu cáa sá trà chuyán Äà má nhÆng khÃng cà tiÃu Äiám."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
 msgstr "ThÃng bÃo khi bán bà ÄÄng nháp"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Bát tát thÃng bÃo khi mát liÃn lác trác tuyán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
 msgstr "ThÃng bÃo khi bán bà ÄÄng xuát"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Bát/tát thÃng bÃo khi mát liÃn lác ngoái tuyÃn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "DÃng biáu tÆáng xÃc cám"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Bát/tát chuyán Äái kà tá miÃu tá mát cÆái thÃnh biáu tÆáng xÃc cám trong khi "
 "trà chuyán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "Hián danh sÃch liÃn lác trong phÃng"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Bát/tát hián thá danh sÃch liÃn lác trong phÃng tÃn gáu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "Sác thÃi cáa sá trà chuyán"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Sác thÃi ÄÆác dÃng Äá hián thá cuác Äái thoái trong cáa sá trà chuyán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 msgid "Chat window theme variant"
 msgstr "Sác thÃi cáa sá trà chuyán"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Sác thÃi ÄÆác dÃng Äá hián thá cuác Äái thoái trong cáa sá trà chuyán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
 msgid "Path of the Adium theme to use"
 msgstr "ÄÆáng dán Äán sác thÃi Adium cán dÃng"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+#, fuzzy
+#| msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
 msgstr "ÄÆáng dán Äán sác thÃi Adium cán dÃng náu dÃng sác thÃi Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "Bát bá cÃng cá phÃt trián WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Bát/tát bá cÃng cá phÃt trián WebKit, nhÆ trÃnh kiám tra Web."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "ThÃng bÃo ngÆái dÃng khÃc khi bán Äang nháp liáu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
@@ -392,39 +343,39 @@ msgstr ""
 "CÃ gái tráng thÃi 'composing' (nháp liáu) hoác 'paused' (tám dáng) khÃng. "
 "Hián thái khÃng ánh hÆáng tráng thÃi 'gone' (Äi váng)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "DÃng sác thÃi cho phÃng trà chuyán"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
 msgid "Whether to use the theme for chat rooms."
 msgstr "Bát/tát dÃng sác thÃi cho phÃng trà chuyán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "NgÃn ngá kiám tra chÃnh tá"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Danh sÃch ngÃn ngá Äá kiám tra chÃnh tá, phÃn cÃch báng dáu pháy (v.d. \"en, "
 "fr, ja, vi\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "Bát kiám tra chÃnh tá"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Bát/tát kiám tra Äoán gà so vái nháng ngÃn ngá Äà chán hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "KÃ tá Äián nát tÃn hiáu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -432,53 +383,53 @@ msgstr ""
 "KÃ tá cán thÃm vÃo sau tÃn hiáu khi sá dáng chác nÄng Äián nát tÃn hiáu "
 "(tab) trong nhÃm trà chuyán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy nÃn dÃng ánh Äái dián cáa liÃn lác lÃm biáu tÆáng cáa sá trà chuyán"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "DÃng ánh Äái dián cho liÃn lác lÃm biáu tÆáng cáa sá trà chuyán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
 msgid "Last account selected in Join Room dialog"
 msgstr "TÃi khoán chán cuái cÃng trong háp thoái Tham gia phÃng"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
 msgstr "MÃy quay"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
 msgstr "Vá trà mÃy quay"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr "Há trá khá tiáng vang"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
 msgid "Show hint about closing the main window"
 msgstr "Hián gái à vá ÄÃng cáa sá chÃnh"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -486,239 +437,292 @@ msgstr ""
 "CÃ hián thá háp thoái thÃng Äiáp vá viác ÄÃng cáa sá chÃnh báng nÃt \"x\" "
 "trÃn thanh táa Äá hay khÃng."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
 msgid "Empathy can publish the user's location"
 msgstr "Empathy ÄÆác phÃp cÃng bá vá trà ngÆái dÃng"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Bát/tát cÃng bá vá trà ngÆái dÃng vái nháng liÃn lác."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy ÄÆác phÃp dÃng máng Äá xÃc Äánh vá trÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Bát/tát cho phÃp Empathy dÃng máng Äá xÃc Äánh vá trÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy ÄÆác phÃp dÃng máng di Äáng Äá xÃc Äánh vá trÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Bát/tát cho phÃp Empathy dÃng máng di Äáng Äá xÃc Äánh vá trÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy ÄÆác phÃp dÃng GPS Äá xÃc Äánh vá trÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Bát/tát cho phÃp Empathy dÃng GPS Äá xÃc Äánh vá trÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy nÃn giám Äá chÃnh xÃc vá trà Äáa lÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Bát/tát buác Empathy giám Äá chÃnh xÃc vá trà và là do riÃng tÆ."
 
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
 msgstr "KhÃng cung cáp là do"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "The change in state was requested"
 msgstr "Thay Äái vá tÃnh tráng ÄÃ ÄÆác yÃu cáu"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "You canceled the file transfer"
 msgstr "Bán ÄÃ thÃi tián trÃnh truyán táp tin"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "The other participant canceled the file transfer"
 msgstr "NgÆái dá khÃc ÄÃ thÃi tián trÃnh truyán táp tin"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "Error while trying to transfer the file"
 msgstr "Gáp lái trong khi thá truyán táp tin ÄÃ"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:752
 msgid "The other participant is unable to transfer the file"
 msgstr "NgÆái dá khÃc khÃng thá truyán táp tin ÄÃ"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:755 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Lái khÃng rÃ"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:918
 msgid "File transfer completed, but the file was corrupted"
 msgstr "HoÃn tát truyán nhÆng táp tin bá hÆ"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1204
 msgid "File transfer not supported by remote contact"
 msgstr "Äáu liÃn lác bÃn kia khÃng há trá truyán táp tin"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1260
 msgid "The selected file is not a regular file"
 msgstr "Táp tin ÄÆác chán khÃng phái táp tin bÃnh thÆáng"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1269
 msgid "The selected file is empty"
 msgstr "Táp tin ÄÆác chán là táp tin ráng"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "KhÃng tÃm tháy mát kháu"
+
+#: ../libempathy/empathy-keyring.c:202
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Mát kháu tÃi khoán IM cho %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:237
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Mát kháu phÃng tÃn gáu '%s' trÃn tÃi khoán %s (%s)"
+
+#: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nhá cuác gái tá %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:411
 #, c-format
 msgid "Called %s"
 msgstr "Gái cho %s"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:414
 #, c-format
 msgid "Call from %s"
 msgstr "Cuác gái tá %s"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d giÃy trÆác"
+
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d phÃt trÆác"
+
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d giá trÆác"
+
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d ngÃy trÆác"
+
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d tuán trÆác"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d thÃng trÆác"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "trong tÆÆng lai"
+
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "CÃ mát"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Bán"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Váng mát"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "VÃ hÃnh"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Ngoái tuyán"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "KhÃng rÃ"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "KhÃng cung cáp là do"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Tráng thÃi ÄÆác Äát là ngoái tuyán"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "Lái máng"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Lái xÃc thác"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Lái mát mÃ"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "TÃn Äang ÄÆác dÃng"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Cháng nhán khÃng ÄÆác cung cáp"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Cháng nhán khÃng ÄÃng tin"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Cháng nhán ÄÃ hát hán"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Cháng nhán khÃng ÄÆác kÃch hoát"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "TÃn mÃy cáa cháng nhán khÃng tÆÆng áng"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "VÃn tay cáa cháng nhán khÃng tÆÆng áng"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Cháng nhán tá kÃ"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Lái cháng nhán"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "KhÃng há trá mà hoÃ"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Cháng nhán khÃng háp lá"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Kát nái bá tá chái"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "KhÃng thá thiát láp kát nái"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Kát nái bá Äát"
 
-#: ../libempathy/empathy-utils.c:355
-#| msgid "This resource is already connected to the server"
+#: ../libempathy/empathy-utils.c:354
 msgid "This account is already connected to the server"
 msgstr "TÃi khoán nÃy ÄÃ ÄÆác kát nái Äán mÃy chá rái"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Kát nái bá thay báng mát kát nái mái dÃng cÃng tÃi nguyÃn"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "TÃi khoán nÃy Äà cà trÃn mÃy chá"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "MÃy chá Äang bán khÃng thá xá là kát nái"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Cháng nhán bá thu hái"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Cháng nhán dÃng mát mà yáu hoác khÃng an toÃn"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -726,169 +730,49 @@ msgstr ""
 "Äá dÃi cháng nhán mÃy chá, hoác Äá sÃu chuái cháng nhán, vÆát quà giái hán "
 "cáa thÆ vián mát mÃ"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:372
 msgid "Your software is too old"
 msgstr "Phán mám cáa bán cÅ quÃ"
 
-#: ../libempathy/empathy-utils.c:375
-#| msgid "Interval (seconds)"
+#: ../libempathy/empathy-utils.c:374
 msgid "Internal error"
 msgstr "Lái nái bá"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:503
 msgid "People Nearby"
 msgstr "NgÆái chung quanh"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:508
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Nhát Bán"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:537
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:538
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d giÃy trÆác"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d phÃt trÆác"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d giá trÆác"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ngÃy trÆác"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d tuán trÆác"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d thÃng trÆác"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "trong tÆÆng lai"
-
-#: ../libempathy/empathy-keyring.c:75
-#| msgid "Phrase not found"
-msgid "Password not found"
-msgstr "KhÃng tÃm tháy mát kháu"
-
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Mát kháu tÃi khoán IM cho %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Mát kháu phÃng tÃn gáu '%s' trÃn tÃi khoán %s (%s)"
-
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Mái tÃi khoán"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
-msgid "Account"
-msgstr "TÃi khoán"
-
-#: ../libempathy-gtk/empathy-account-widget.c:683
-msgid "Password"
-msgstr "Mát kháu"
-
-#: ../libempathy-gtk/empathy-account-widget.c:684
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "MÃy phác vá"
-
-#: ../libempathy-gtk/empathy-account-widget.c:685
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
-msgid "Port"
-msgstr "Cáng"
-
-#: ../libempathy-gtk/empathy-account-widget.c:765
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1398
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Username:"
-msgstr "TÃn ngÆái dÃng:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1710
-msgid "A_pply"
-msgstr "Ã_p dáng"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1739
-msgid "L_og in"
-msgstr "ÄÄng _nháp"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1812
-msgid "This account already exists on the server"
-msgstr "TÃi khoán nÃy Äà cà trÃn mÃy chá"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1816
-msgid "Create a new account on the server"
-msgstr "Táo tÃi khoán mái trÃn mÃy chá"
-
-#. To translators: The first parameter is the login id and the
-#. * 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:2241
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s trÃn %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:2267
-#, c-format
-msgid "%s Account"
-msgstr "TÃi khoán %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2271
-msgid "New account"
-msgstr "TÃi khoán mái"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
+#, fuzzy
+#| msgid "Pass_word:"
+msgid "Pass_word"
 msgstr "Mát khá_u:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name:"
+#, fuzzy
+#| msgid "Screen _Name:"
+msgid "Screen _Name"
 msgstr "TÃ_n hián thá:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
@@ -910,30 +794,32 @@ msgstr "Nhá mát kháu"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../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:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
+#, fuzzy
+#| msgid "_Port:"
+msgid "_Port"
 msgstr "_Cáng:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../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:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "_Server:"
+#, fuzzy
+#| msgid "_Server:"
+msgid "_Server"
 msgstr "_MÃy phác vá:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
 msgstr "Cao cáp"
@@ -951,14 +837,90 @@ msgstr "Mát kháu AIM cáa bán là gÃ?"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "Remember Password"
 msgstr "Nhá mát kháu"
 
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:323
+msgid "Account"
+msgstr "TÃi khoán"
+
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "Mát kháu"
+
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+msgid "Server"
+msgstr "MÃy phác vá"
+
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+msgid "Port"
+msgstr "Cáng"
+
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:820
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1432
+msgid "Username:"
+msgstr "TÃn ngÆái dÃng:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1749
+msgid "A_pply"
+msgstr "Ã_p dáng"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1778
+msgid "L_og in"
+msgstr "ÄÄng _nháp"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1848
+msgid "This account already exists on the server"
+msgstr "TÃi khoán nÃy Äà cà trÃn mÃy chá"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1852
+msgid "Create a new account on the server"
+msgstr "Táo tÃi khoán mái trÃn mÃy chá"
+
+#. To translators: The first parameter is the login id and the
+#. * 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:2269
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s trÃn %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:2295
+#, c-format
+msgid "%s Account"
+msgstr "TÃi khoán %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2299
+msgid "New account"
+msgstr "TÃi khoán mái"
+
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D:"
+#, fuzzy
+#| msgid "Login I_D:"
+msgid "Login I_D"
 msgstr "I_D ÄÄng nháp:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -975,7 +937,9 @@ msgid "What is your GroupWise password?"
 msgstr "Mát kháu GroupWise cáa bán là gÃ?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN:"
+#, fuzzy
+#| msgid "ICQ _UIN:"
+msgid "ICQ _UIN"
 msgstr "ICQ _UIN:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
@@ -983,8 +947,9 @@ msgid "<b>Example:</b> 123456789"
 msgstr "<b>VÃ dá:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
+#, fuzzy
+#| msgid "Ch_aracter set:"
+msgid "Ch_aracter set"
 msgstr "_Báng mÃ:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
@@ -995,57 +960,22 @@ msgstr "UIN ICQ cáa bán là gÃ?"
 msgid "What is your ICQ password?"
 msgstr "Mát kháu ICQ cáa bán là gÃ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
-msgid "Auto"
-msgstr "Tá Äáng"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
-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:244
-msgid "Register"
-msgstr "ÄÄng kÃ"
-
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
-msgid "Options"
-msgstr "Tuá chán"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
-msgid "None"
-msgstr "KhÃng"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Network"
 msgstr "Máng"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Network:"
-msgstr "Máng:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
+#, fuzzy
+#| msgid "Character set:"
+msgid "Character set"
 msgstr "Báng mÃ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "ThÃmâ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
 #: ../src/empathy-accounts-dialog.ui.h:2
@@ -1053,20 +983,21 @@ msgstr "ThÃmâ"
 msgid "Remove"
 msgstr "Bá"
 
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "LÃn"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
-#| msgid "Domain"
+#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "Xuáng"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Servers"
 msgstr "MÃy phác vá"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1074,27 +1005,35 @@ msgstr ""
 "Phán lán cÃc mÃy chá IRC khÃng yÃu cáu mát kháu nÃn náu bán khÃng chác chán "
 "thà Äáng nháp mát kháu vÃo ÄÃy."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Nickname:"
-msgstr "Biát hiáu:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Password:"
-msgstr "Mát kháu:"
+#, fuzzy
+#| msgid "Nickname:"
+msgid "Nickname"
+msgstr "Biát hiáu:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Quit message:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+#, fuzzy
+#| msgid "Quit message:"
+msgid "Quit message"
 msgstr "ThÃng Äiáp thoÃt:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Real name:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+#, fuzzy
+#| msgid "Real name:"
+msgid "Real name"
 msgstr "TÃn thát:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "TÃn ngÆái dÃng:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Which IRC network?"
 msgstr "Máng IRC nÃo?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "Biát hiáu IRC cáa bán là gÃ?"
 
@@ -1140,11 +1079,15 @@ msgid "I_gnore SSL certificate errors"
 msgstr "_Bá qua lái cháng nhán SSL"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
+#, fuzzy
+#| msgid "Priori_ty:"
+msgid "Priori_ty"
 msgstr "Æ_u tiÃn:"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce:"
+#, fuzzy
+#| msgid "Reso_urce:"
+msgid "Reso_urce"
 msgstr "TÃi ngu_yÃn:"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
@@ -1152,13 +1095,13 @@ msgid "Encr_yption required (TLS/SSL)"
 msgstr "YÃu cáu _mát mà (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Use old SS_L"
-msgstr "DÃng SS_L cÅ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
 msgstr "ÄÃ thiát láp mÃy chá"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "DÃng SS_L cÅ"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ID Jabber cáa bán là gÃ?"
@@ -1175,44 +1118,87 @@ msgstr "Mát kháu Jabber cáa bán là gÃ?"
 msgid "What is your desired Jabber password?"
 msgstr "Mát kháu Jabber mong muán cáa bán là gÃ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user hotmail com"
-msgstr "<b>VÃ dá:</b> user hotmail com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "ID Windows Live cáa bán là gÃ?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Mát kháu Windows Live cáa bán là gÃ?"
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname:"
+#, fuzzy
+#| msgid "Nic_kname:"
+msgid "Nic_kname"
 msgstr "_Biát hiáu:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name:"
+#, fuzzy
+#| msgid "_Last Name:"
+msgid "_Last Name"
 msgstr "_Há:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name:"
+#, fuzzy
+#| msgid "_First Name:"
+msgid "_First Name"
 msgstr "_TÃn:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name:"
+#, fuzzy
+#| msgid "_Published Name:"
+msgid "_Published Name"
 msgstr "TÃn cÃng _bá:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
+#, fuzzy
+#| msgid "_Jabber ID:"
+msgid "_Jabber ID"
 msgstr "ID _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address:"
+#, fuzzy
+#| msgid "E-_mail address:"
+msgid "E-_mail address"
 msgstr "Äáa chá e-_mail:"
 
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user hotmail com"
+msgstr "<b>VÃ dá:</b> user hotmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
+msgstr "ID Windows Live cáa bán là gÃ?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "Mát kháu Windows Live cáa bán là gÃ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "Tá Äáng"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "ÄÄng kÃ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "Tuá chán"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "KhÃng"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username:"
+#, fuzzy
+#| msgid "_Username:"
+msgid "_Username"
 msgstr "TÃn ngÆái _dÃng:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
@@ -1236,7 +1222,9 @@ msgid "Miscellaneous Options"
 msgstr "Tuá chán linh tinh"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server:"
+#, fuzzy
+#| msgid "STUN Server:"
+msgid "STUN Server"
 msgstr "MÃy chá STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
@@ -1247,17 +1235,14 @@ msgstr "Tá Äáng phÃt hián mÃy chá STUN"
 msgid "Discover Binding"
 msgstr "PhÃt hián gán kát"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "MÃy phác vá:"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Keep-Alive Options"
 msgstr "Tuá chán Keep-Alive (giá kát nái)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism:"
+#, fuzzy
+#| msgid "Mechanism:"
+msgid "Mechanism"
 msgstr "CÆ chá:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
@@ -1265,11 +1250,15 @@ msgid "Interval (seconds)"
 msgstr "Khoáng láp (giÃy)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username:"
+#, fuzzy
+#| msgid "Authentication username:"
+msgid "Authentication username"
 msgstr "TÃn ngÆái dÃng Äá xÃc thác:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport:"
+#, fuzzy
+#| msgid "Transport:"
+msgid "Transport"
 msgstr "PhÆÆng tián:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
@@ -1280,18 +1269,24 @@ msgstr "Äánh tuyán láng láo"
 msgid "Ignore TLS Errors"
 msgstr "Bá qua lái TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Port:"
-msgstr "Cáng:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#, fuzzy
+#| msgid "E-mail address"
+msgid "Local IP Address"
+msgstr "Äáa chá E-mail"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ID ÄÄng nháp SIP cáa bán là gÃ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP account password?"
 msgstr "Mát kháu SIP cáa bán là gÃ?"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Mát khá_u:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Yahoo! I_D:"
 msgstr "I_D Yahoo!:"
@@ -1304,6 +1299,14 @@ msgstr "_Bá qua lái mái hái tháo hay phÃng trà chuyán"
 msgid "_Room List locale:"
 msgstr "_Mián Äáa phÆÆng danh sÃch phÃng:"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "_Báng mÃ:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Cáng:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Yahoo! ID cáa bán là gÃ?"
@@ -1312,36 +1315,36 @@ msgstr "Yahoo! ID cáa bán là gÃ?"
 msgid "What is your Yahoo! password?"
 msgstr "Mát kháu Yahoo! cáa bán là gÃ?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "KhÃng thá chuyán Äái ánh"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr "KhÃng cà Äánh dáng ánh ÄÆác há trá nÃo trÃn há tháng nÃy"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr "KhÃng thá lÆu ánh vÃo táp tin"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "Chán ánh riÃng"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "Cháp hÃnh..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "KhÃng cà ánh"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "ánh"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "Mái táp tin"
 
@@ -1349,6 +1352,35 @@ msgstr "Mái táp tin"
 msgid "Click to enlarge"
 msgstr "Nhán Äá phÃng to"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, fuzzy, c-format
+#| msgid "Authentification failed for account <b>%s</b>"
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "Lái xÃc thác cho tÃi khoán <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3725
+msgid "Retry"
+msgstr "Thá lái"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Nháp mát kháu cho tÃi khoán\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "Chán..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "_Chán"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1374,40 +1406,41 @@ msgstr "Giao thác nÃy khÃng há trá cuác gái khán cáp"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Bán khÃng Äá tÃn dáng Äá thác hián cuác gái nÃy"
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Lái má trà chuyán riÃng tÆ"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Chá Äá khÃng ÄÆác há trá trong cuác trà chuyán nÃy"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Bán khÃng ÄÆác phÃp thay Äái chá Äá trà chuyán"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr "\"%s\" khÃng phái là ID háp lá"
+#: ../libempathy-gtk/empathy-chat.c:968
+#, fuzzy
+#| msgid "invalid contact"
+msgid "Invalid contact ID"
+msgstr "liÃn lác khÃng háp lá"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1055
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: xoà mái trao Äái trong cuác trà chuyán hián thái"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <chá Äá>: Äát chá Äá cho cuác trà chuyán hián thái"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id phÃng trà chuyán>: tham gia phÃng trà chuyán mái"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id phÃng trà chuyán>: tham gia phÃng trà chuyán mái"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1415,25 +1448,25 @@ msgstr ""
 "/part [<ID phÃng trà chuyán>] [<là do>]: rái phÃng (mác Äánh là phÃng hián "
 "thái)"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1072
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id liÃn lác> [<thÃng Äiáp>]: má trà chuyán riÃng tÆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id liÃn lác> <thÃng Äiáp>: má trà chuyán riÃng tÆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <biát hiáu>: Äái biát hiáu cáa bán trÃn mÃy chá hián thái"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <thÃng Äiáp>: gái thÃng Äiáp ACTION (hÃnh Äáng) Äán cuác trà chuyán hián "
 "thái"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1084
 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 "
@@ -1443,140 +1476,138 @@ msgstr ""
 "gái thÃng Äiáp bát Äáu báng '/'. VÃ dá \"/sau /join ÄÆác dÃng Äá tham gia "
 "phÃng trà chuyán\""
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID liÃn lác>: hián thÃng tin vá mát liÃn lác"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<lánh>]: hián mái lánh há trá. Náu cà <lánh> thà hián cÃch sá dáng."
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1111
 #, c-format
 msgid "Usage: %s"
 msgstr "CÃch dÃng: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "Unknown command"
 msgstr "Lánh lá"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1282
 msgid "Unknown command; see /help for the available commands"
 msgstr "Lánh lá, xem /help Äá biát danh sÃch lánh cà thá dÃng"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1539
 msgid "insufficient balance to send message"
 msgstr "KhÃng Äá sá dÆ tÃi khoán Äá gái tin nhán"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1543 ../libempathy-gtk/empathy-chat.c:1557
+#: ../libempathy-gtk/empathy-chat.c:1620
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Gáp lái khi gái tin nhán '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1624
 #, c-format
 msgid "Error sending message: %s"
 msgstr "KhÃng thá gái tin nhán: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1577
+#: ../libempathy-gtk/empathy-chat.c:1551
 #, c-format
-#| msgid "insufficient balance to send message"
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "khÃng Äá sá dÆ tÃi khoán Äá gái tin nhán. <a href='%s'>HÃy náp tián</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1591
 msgid "not capable"
 msgstr "khÃng thá"
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1598
 msgid "offline"
 msgstr "ngoái tuyán"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "invalid contact"
 msgstr "liÃn lác khÃng háp lá"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "permission denied"
 msgstr "khÃng Äá quyán truy cáp"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "too long message"
 msgstr "tin nhán quà dÃi"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "not implemented"
 msgstr "chÆa ÄÆác thác hián"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1614
 msgid "unknown"
 msgstr "khÃng rÃ"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1681 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "Chá Äá:"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1696
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Chá Äá ÄÆác Äát thÃnh: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
-#| msgid "Topic set to: %s"
 msgid "Topic set by %s to: %s"
 msgstr "%s Äát chá Äá thÃnh: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1703
 msgid "No topic defined"
 msgstr "ChÆa xÃc Äánh chá Äá"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2219
 msgid "(No Suggestions)"
 msgstr "(KhÃng cà gái Ã)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2287
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "ThÃm '%s' vÃo tá Äián"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2350
+#: ../libempathy-gtk/empathy-chat.c:2324
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ThÃm '%s' vÃo tá Äián %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2394
 msgid "Insert Smiley"
 msgstr "ChÃn hÃnh cÆái"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2412
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "_Gái"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2469
 msgid "_Spelling Suggestions"
 msgstr "_Gái à chÃnh tá"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Failed to retrieve recent logs"
 msgstr "Lái nhán bán ghi gán ÄÃy"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ÄÃ ngát kát nái"
@@ -1584,12 +1615,12 @@ msgstr "%s ÄÃ ngát kát nái"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2730
+#: ../libempathy-gtk/empathy-chat.c:2726
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ÄÃ ÄÃ vÄng %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ÄÃ bá ÄÃ"
@@ -1597,17 +1628,17 @@ msgstr "%s ÄÃ bá ÄÃ"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2741
+#: ../libempathy-gtk/empathy-chat.c:2737
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ÄÃ cám %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%s was banned"
 msgstr "%s ÄÃ bá cám"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s has left the room"
 msgstr "%s rái phÃng"
@@ -1617,17 +1648,17 @@ msgstr "%s rái phÃng"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2753
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2778
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s vÃo phÃng"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2803
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s bÃy giá là %s"
@@ -1635,55 +1666,50 @@ msgstr "%s bÃy giá là %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2994
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../libempathy-gtk/empathy-chat.c:2990 ../src/empathy-call-window.c:1468
+#: ../src/empathy-call-window.c:1518 ../src/empathy-call-window.c:2571
+#: ../src/empathy-event-manager.c:1176
 msgid "Disconnected"
 msgstr "Bá ngát kát nái"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3665
 msgid "Would you like to store this password?"
 msgstr "Bán cà muán lÆu mát kháu khÃng?"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3671
 msgid "Remember"
 msgstr "Nhá"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3681
 msgid "Not now"
 msgstr "KhÃng phái lÃc nÃy"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "Thá lái"
-
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3729
 msgid "Wrong password; please try again:"
 msgstr "Mát kháu sai; vui lÃng thá lái:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3859
 msgid "This room is protected by a password:"
 msgstr "VÃo phÃng nÃy cán mát kháu:"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3886
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "VÃo"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4078 ../src/empathy-event-manager.c:1197
 msgid "Connected"
 msgstr "ÄÃ kát nái"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4133
 msgid "Conversation"
 msgstr "Cuác trà chuyán"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4138
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1708,17 +1734,16 @@ msgstr "KhÃng Äá quyán truy cáp"
 msgid "Could not block contact"
 msgstr "KhÃng thá chán liÃn lác"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
 msgstr "Thay Äái liÃn lác bá chán"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "TÃi khoán:"
 
@@ -1726,374 +1751,168 @@ msgstr "TÃi khoán:"
 msgid "Blocked Contacts"
 msgstr "LiÃn lác bá chán"
 
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "_ChÃp Äáa chá liÃn kát"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Há tÃn"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "Má _liÃn kát"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Sá Äián thoái"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Äáa chá E-mail"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "LiÃn lác mái"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Trang Web"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "Chán %s chá?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "NgÃy sinh"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "Bán cà chác muán chán '%s' lán náa khÃng?"
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Lán cuái cÃng trác tuyán:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "_Chán"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "MÃy phác vá:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:423
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "_ThÃng bÃo ngÆái dÃng lám dáng"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Kát nái tá:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "YÃu cáu ÄÄng kÃ"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "ThÃng Äiáp khi váng mát:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "cÃng viác"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "nhÃ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "di Äáng"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "tiáng"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "Æa thÃch"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "_Chán ngÆái dÃng"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "bÆu chÃnh"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "Quyát Äánh _sau nÃy"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "bÆu kián"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
 msgid "Search contacts"
 msgstr "TÃm liÃn lác"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search: "
 msgstr "TÃm: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
 msgstr "ThÃ_m liÃn lác"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
 msgstr "KhÃng tÃm tháy liÃn lác"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
 msgstr "ThÃng Äiáp giái thiáu bán thÃn:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Cho mÃnh biát khi bán lÃn máng nhÃ. CÃm Æn!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:567
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "KÃnh:"
+#: ../libempathy-gtk/empathy-contact-widget.c:170
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "LÆu ánh riÃng"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:747
-#: ../libempathy-gtk/empathy-individual-widget.c:455
-msgid "Country ISO Code:"
-msgstr "MÃ ISO quác gia:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:749
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "Quác gia:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:751
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "Bang:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:753
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "ThÃnh phá:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:463
-msgid "Area:"
-msgstr "VÃng:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:757
-#: ../libempathy-gtk/empathy-individual-widget.c:465
-msgid "Postal Code:"
-msgstr "MÃ bÆu chÃnh:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "ÄÆáng:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "Toà nhÃ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "Táng:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:765
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "PhÃng:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:767
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "Chá:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:769
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "MÃ tá:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:771
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URI:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:773
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "Mác chÃnh xÃc:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:775
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "Nhiáu:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:777
-#: ../libempathy-gtk/empathy-individual-widget.c:485
-msgid "Vertical Error (meters):"
-msgstr "Nhiáu dác (mÃt):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:779
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "Nhiáu ngang (mÃt):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:781
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "Tác Äá:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:783
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "Mang:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:785
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "Tác Äá leo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:787
-#: ../libempathy-gtk/empathy-individual-widget.c:495
-msgid "Last Updated on:"
-msgstr "Lán cáp nhát cuái:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "Kinh Äá:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:791
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "VÄ Äá:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:793
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "Cao Äá:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:846
-#: ../libempathy-gtk/empathy-contact-widget.c:861
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:35
-msgid "Location"
-msgstr "Vá trÃ"
-
-#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
-#: ../libempathy-gtk/empathy-individual-widget.c:610
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:659
-msgid "%B %e, %Y at %R UTC"
-msgstr "%B %e, %Y lÃc %R UTC"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:997
-#: ../libempathy-gtk/empathy-individual-widget.c:900
-msgid "Save Avatar"
-msgstr "LÆu ánh riÃng"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
-#: ../libempathy-gtk/empathy-individual-widget.c:958
-msgid "Unable to save avatar"
-msgstr "KhÃng thá lÆu ánh riÃng"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
-#| msgid "Technical Details"
-msgid "Personal Details"
-msgstr "Chi tiát cà nhÃn"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1447
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Chi tiát liÃn lác"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-#| msgid "Full name:"
-msgid "Full name"
-msgstr "Há tÃn"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-#| msgid "Phone number:"
-msgid "Phone number"
-msgstr "Sá Äián thoái"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-#| msgid "E-mail address:"
-msgid "E-mail address"
-msgstr "Äáa chá E-mail"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-#| msgid "Website:"
-msgid "Website"
-msgstr "Trang Web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
-#| msgid "Birthday:"
-msgid "Birthday"
-msgstr "NgÃy sinh"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Last seen:"
-msgstr "Lán cuái cÃng trác tuyán:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
-msgid "Connected from:"
-msgstr "Kát nái tá:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
-msgid "Away message:"
-msgstr "ThÃng Äiáp khi váng mát:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-#| msgid "Work"
-msgid "work"
-msgstr "cÃng viác"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-#| msgid "Romeo"
-msgid "home"
-msgstr "nhÃ"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-#| msgid "Mobile"
-msgid "mobile"
-msgstr "di Äáng"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-#| msgid "Favorite"
-msgid "voice"
-msgstr "tiáng"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-#| msgid "Preferences"
-msgid "preferred"
-msgstr "Æa thÃch"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
-msgid "postal"
-msgstr "bÆu chÃnh"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
-#| msgid "Appearance"
-msgid "parcel"
-msgstr "bÆu kián"
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "KhÃng thá lÆu ánh riÃng"
 
 #. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
+#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
+#: ../libempathy-gtk/empathy-user-info.c:444
+#, fuzzy
+#| msgid "Identifier:"
+msgid "Identifier"
 msgstr "Äánh danh:"
 
-#. Alias
+#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
+#: ../libempathy-gtk/empathy-user-info.c:449
+#, fuzzy
+#| msgid "Alias:"
+msgid "Alias"
 msgstr "BÃ danh:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Vá trÃ</b> vÃo (ngÃy)\t"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Chi tiát liÃn lác"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requestedâ"
 msgstr "YÃu cáu thÃng tinâ"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Vá trÃ</b> vÃo (ngÃy)\t"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Client Information"
 msgstr "ThÃng tin áng dáng khÃch"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS:"
+#, fuzzy
+#| msgid "OS:"
+msgid "OS"
 msgstr "HÄH:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Version:"
+#, fuzzy
+#| msgid "Version:"
+msgid "Version"
 msgstr "PhiÃn bán:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Client:"
+#, fuzzy
+#| msgid "Client:"
+msgid "Client"
 msgstr "áng dáng khÃch:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:331
+#: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
 msgstr "NhÃm"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:343
+#: ../libempathy-gtk/empathy-groups-widget.c:339
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2101,187 +1920,340 @@ msgstr ""
 "Chán nháng nhÃm nÆi bán muán liÃn lác nÃy xuát hián; bán cà khá nÄng chán "
 "mát hay nhiáu nhÃm hay khÃng chán nhÃm (â0 nhÃm)."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
 msgstr "_ThÃm NhÃm"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Chán"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1970
+#: ../libempathy-gtk/empathy-groups-widget.c:403
 msgid "Group"
 msgstr "NhÃm"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "LiÃn lác mái"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "Chán %s chá?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Bán cà chác muán chán '%s' lán náa khÃng?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Danh sÃch sá bá chán:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Danh sÃch khÃng thá bá chán:"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "_Chán"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_ThÃng bÃo ngÆái dÃng lám dáng"
+
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Sáa thÃng tin liÃn lác"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
 msgid "Linked Contacts"
 msgstr "LiÃn lác cà kát nái"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "chÆa cÃi Äát gnome-contacts"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Vui lÃng cÃi Äát gnome-contacts Äá truy cáp chi tiát liÃn lác."
+
 #. 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:173
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:345
+#: ../libempathy-gtk/empathy-individual-menu.c:347
 msgid "Select account to use to place the call"
 msgstr "Chán tÃi khoán dÃng Äá gái Äián"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-individual-menu.c:351
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Gái"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:414
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Mobile"
 msgstr "Di Äáng"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "Work"
 msgstr "CÃng viác"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:420
 msgid "HOME"
 msgstr "NHÃ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:661
 msgid "_Block Contact"
 msgstr "_Chán liÃn lác"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:717
+msgid "Delete and _Block"
+msgstr "Xoà và _chán"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:779
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Bán thác sá muán bá liÃn lác '%s' khÃng?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:788
+#, 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 ""
+"Bán cà muán bá liÃn lác ÄÆác liÃn kát '%s' khÃng? Chà à Äiáu nÃy sá bá mái "
+"liÃn lác hÃnh thÃnh nÃn liÃn lác liÃn kát nÃy."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:799
+msgid "Removing contact"
+msgstr "Äang gá bá liÃn lác"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-view.c:2454
+msgid "_Remove"
+msgstr "_Bá"
+
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1018
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:1
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "_Trà chuyán"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1261
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
+#: ../libempathy-gtk/empathy-individual-menu.c:1294
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Gái thoái"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1327
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Gái video"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:4
+#: ../libempathy-gtk/empathy-individual-menu.c:1368
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Cuác trà chuyán trÆác"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
+#: ../libempathy-gtk/empathy-individual-menu.c:1397
 msgid "Send File"
 msgstr "Gái táp tin"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgid "Share My Desktop"
 msgstr "Chia sá mÃn hÃnh lÃm viác"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1453
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 msgid "Favorite"
 msgstr "Æa thÃch"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
-#| msgid "telepathy-salut not installed"
-msgid "gnome-contacts not installed"
-msgstr "chÆa cÃi Äát gnome-contacts"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
-msgid "Please install gnome-contacts to access contacts details."
-msgstr "Vui lÃng cÃi Äát gnome-contacts Äá truy cáp chi tiát liÃn lác."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1482
 msgid "Infor_mation"
 msgstr "ThÃn_g tin"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1531
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Sáa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1647
+#: ../src/empathy-chat-window.c:1235
 msgid "Inviting you to this room"
 msgstr "Mái bán vÃo phÃng nÃy"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1693
 msgid "_Invite to Chat Room"
 msgstr "Má_i vÃo phÃng trà chuyán"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:5
+#: ../libempathy-gtk/empathy-individual-menu.c:1889
 msgid "_Add Contactâ"
 msgstr "ThÃ_m liÃn lácâ"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2304
-msgid "Delete and _Block"
-msgstr "Xoà và _chán"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2374
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Bán cà thác sá muán bá nhÃm '%s' khÃng?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2377
 msgid "Removing group"
 msgstr "Äang gá bá nhÃm"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
-msgid "_Remove"
-msgstr "_Bá"
+#: ../libempathy-gtk/empathy-individual-view.c:2445
+#, fuzzy
+#| msgid "Real name:"
+msgid "Re_name"
+msgstr "TÃn thát:"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Bán thác sá muán bá liÃn lác '%s' khÃng?"
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "KÃnh:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "MÃ ISO quác gia:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "Quác gia:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "Bang:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "ThÃnh phá:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "VÃng:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "MÃ bÆu chÃnh:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "ÄÆáng:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "Toà nhÃ:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "Táng:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "PhÃng:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "Chá:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "MÃ tá:"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "Mác chÃnh xÃc:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "Nhiáu:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "Nhiáu dác (mÃt):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "Nhiáu ngang (mÃt):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "Tác Äá:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "Mang:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "Tác Äá leo:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "Lán cáp nhát cuái:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "Kinh Äá:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "VÄ Äá:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "Cao Äá:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
+msgid "Location"
+msgstr "Vá trÃ"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, 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 ""
-"Bán cà muán bá liÃn lác ÄÆác liÃn kát '%s' khÃng? Chà à Äiáu nÃy sá bá mái "
-"liÃn lác hÃnh thÃnh nÃn liÃn lác liÃn kát nÃy."
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
-msgid "Removing contact"
-msgstr "Äang gá bá liÃn lác"
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y lÃc %R UTC"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "BÃ danh:"
+
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "Äánh danh:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2320,30 +2292,52 @@ msgstr "mÃy phác vá mái"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy cà thá tá khÃm phà và cho phÃp trà chuyán vái ngÆái dÃng kát nái "
+"trÃn cÃng máng nái bá. Náu bán muán dÃng tÃnh nÄng nÃy, hÃy báo Äám thÃng "
+"tin bÃn dÆái là ÄÃng."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
+msgid "People nearby"
+msgstr "NgÆái chung quanh"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:113
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit â Accounts</span> in the Contact List."
+msgstr ""
+"Bán cà thá thay Äái chi tiát sau nÃy, hoác tát tÃnh nÄng nÃy báng cÃch chán "
+"<span style=\"italic\">Sáa â TÃi khoán</span> trong Danh sÃch liÃn lác."
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Nhát kÃ"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Hián"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "TÃm kiám"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat á %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat vái %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
@@ -2361,92 +2355,92 @@ msgstr "<i>* %s %s</i>"
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s giÃy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s phÃt"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Cuác gái kÃo dÃi %s, kát thÃc lÃc %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "HÃm nay"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Yesterday"
 msgstr "HÃm qua"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1735
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "Bát ká lÃc nÃo"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "Bát ká ai"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "Ai"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "Khi nÃo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "Mái thá"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "CÃc cuác trà chuyán"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:25
+#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "CÃc cuác gái"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "Cuác gái Äán"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "Cuác gái Äi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "Cuác gái nhá"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "CÃi gÃ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Bán cà chác bán muán xÃa nhát kà mái cuác trà chuyán trÆác ÄÃy khÃng?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "Dán sách"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "XÃa tá:"
 
@@ -2456,7 +2450,6 @@ msgstr "_Táp tin"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "_Edit"
 msgstr "_Sáa"
 
@@ -2469,13 +2462,12 @@ msgid "Profile"
 msgstr "Há sÆ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Trà chuyán"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-streamed-media-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:24
 msgid "Video"
 msgstr "Video"
 
@@ -2487,132 +2479,121 @@ msgstr "trang 2"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Äang tái...</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
-#| msgid "The specified contact is offline"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "Bán cà nháng loái tÃi khoán tin nhanh/trà chuyán nÃo?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "ThÃm tÃi khoán mái"
+
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr "Nháp Äánh danh hoác sá Äián thoái liÃn lác:"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "Gái _video"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "Gái _thoái"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "Cuác gái mái"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "LiÃn lác ngoái tuyán"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
-#| msgid "The specified contact is not valid"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
 msgstr "LiÃn lác nÃy khÃng háp lá hoác khÃng rÃ"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
-#| msgid "Topic not supported on this conversation"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "The contact does not support this kind of conversation"
 msgstr "LiÃn lác khÃng há trá kiáu trà chuyán nÃy"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "TÃnh nÄng yÃu cáu chÆa ÄÆác cÃi Äát cho giao thác nÃy"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Could not start a conversation with the given contact"
 msgstr "KhÃng thá bát Äáu cuác trà chuyán vái liÃn lác"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "Bán bá cám á kÃnh nÃy"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "KÃnh Äáy"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
-#| msgid "You have been invited to join %s"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "Bán phái ÄÆác mái mái cà thá tham gia kÃnh nÃy"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
-#| msgid "Contact disconnected"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "KhÃng thá tián hÃnh khi ÄÃ ngát kát nái"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "KhÃng Äá quyán truy cáp"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
-#| msgid "There was an error starting the call"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 msgid "There was an error starting the conversation"
 msgstr "Lái bát Äáu cuác hái thoái"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:200
-msgid "Enter a contact identifier or phone number:"
-msgstr "Nháp Äánh danh hoác sá Äián thoái liÃn lác:"
-
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "Cuác trà chuyán mái"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
-#| msgctxt "menu item"
-#| msgid "_Video Call"
-msgid "_Video Call"
-msgstr "Gái _video"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
-#| msgctxt "menu item"
-#| msgid "_Audio Call"
-msgid "_Audio Call"
-msgstr "Gái _thoái"
-
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
-msgid "New Call"
-msgstr "Cuác gái mái"
-
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, c-format
-#| msgid "Authentication failed"
-msgid "Authentification failed for account <b>%s</b>"
-msgstr "Lái xÃc thác cho tÃi khoán <b>%s</b>"
-
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"Nháp mát kháu cho tÃi khoán\n"
-"<b>%s</b>"
-
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:165
+#: ../libempathy-gtk/empathy-presence-chooser.c:201
 msgid "Custom Messageâ"
 msgstr "ThÃng Äiáp riÃngâ"
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:218
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messagesâ"
 msgstr "Sáa thÃng Äiáp riÃngâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to remove this status as a favorite"
 msgstr "Nhán Äá bá tráng thÃi nÃy khái danh sÃch yÃu thÃch"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:351
 msgid "Click to make this status a favorite"
 msgstr "Nhán Äá chán tráng thÃi nÃy là yÃu thÃch"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:385
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:394
 msgid "Set status"
 msgstr "Äát tráng thÃi"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1102
 msgid "Custom messagesâ"
 msgstr "ThÃng Äiáp riÃngâ"
 
@@ -2620,11 +2601,15 @@ msgstr "ThÃng Äiáp riÃngâ"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:610
 #, c-format
 msgid "New %s account"
 msgstr "TÃi khoán %s mái"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_PhÃn biát hoa thÆáng"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "TÃm:"
@@ -2689,31 +2674,36 @@ msgstr "Cuác gái tiáng nÃi ÄÃ kát thÃc"
 msgid "Edit Custom Messages"
 msgstr "Sáa dÃng tráng thÃi riÃng"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "YÃu cáu ÄÄng kÃ"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1114
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s muán ÄÆác phÃp tháy bán khi trác tuyán"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:731
+msgid "_Decline"
+msgstr "_Tá chái"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#, fuzzy
+#| msgid "Accept"
+msgid "_Accept"
+msgstr "Cháp nhán"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1126
 #, c-format
 msgid "Message edited at %s"
 msgstr "Tin nhán ÄÆác chánh sáa lÃc %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1843
 msgid "Normal"
 msgstr "BÃnh thÆáng"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "Cá Äián"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "ÄÆn gián"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "Dán"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "Xanh"
-
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "KhÃng thá xÃc minh Äánh danh cung cáp bái mÃy chá trà chuyán."
@@ -2770,12 +2760,10 @@ msgid "Certificate hostname: %s"
 msgstr "TÃn mÃy trong cháng nhán: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-#| msgid "Continue"
 msgid "C_ontinue"
 msgstr "_Tiáp tác"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
-#| msgid "User requested disconnect"
 msgid "Untrusted connection"
 msgstr "Kát nái khÃng tin cáy"
 
@@ -2791,19 +2779,19 @@ msgstr "Nhá láa chán nÃy cho tÆÆng lai"
 msgid "Certificate Details"
 msgstr "Chi tiát cháng nhán"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "KhÃng thá má Äáa chá URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "Chán mát táp tin"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "KhÃng Äá chá Äá lÆu táp tin"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2811,11 +2799,31 @@ msgid ""
 msgstr ""
 "Cán %s vÃng tráng Äá lÆu táp tin nÃy nhÆng chá cà %s. Vui lÃng chán chá khÃc."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Táp tin Äán tá %s"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "VÃo trác tuyán Äá sáa thÃng tin cà nhÃn."
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+#, fuzzy
+#| msgid "Personal Details"
+msgid "<b>Personal Details</b>"
+msgstr "Chi tiát cà nhÃn"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "_ChÃp Äáa chá liÃn kát"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "Má _liÃn kát"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Mián Äáa phÆÆng hián cÃ"
@@ -2983,55 +2991,14 @@ msgstr "PhÆÆng TÃy"
 msgid "Vietnamese"
 msgstr "Tiáng Viát"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "Select..."
-msgstr "Chán..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "_Select"
-msgstr "_Chán"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "KhÃng cà thÃng bÃo lái"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "Nhán tin (Empathy)"
 
-#: ../src/empathy.c:435
-msgid "Don't connect on startup"
-msgstr "KhÃng kát nái khi khái cháy"
-
-#: ../src/empathy.c:439
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
-"KhÃng hián thá danh sÃch liÃn lác hoác cÃc háp thoái khÃc khi khái cháy"
-
-#: ../src/empathy.c:454
-msgid "- Empathy IM Client"
-msgstr "â TrÃnh gái tin nhán Empathy"
-
-#: ../src/empathy.c:641
-msgid "Error contacting the Account Manager"
-msgstr "Lái liÃn lác trÃnh quán là tÃi khoán"
-
-#: ../src/empathy.c:643
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"Lái liÃn lác trÃnh quán là tÃi khoán Telepathy. Lái lÃ:\n"
-"\n"
-"%s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -3075,44 +3042,70 @@ msgstr "áng dáng khÃch tin nhán tác khác cho GNOME"
 msgid "translator-credits"
 msgstr "NhÃm Viát hÃa GNOME <gnomevi-list lists sourceforge net>"
 
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"KhÃng hián bát ká háp thoái nÃo; thác hián bát ká cÃng viác nÃo (vd, nháp) "
+"và thoÃt"
+
+#: ../src/empathy-accounts.c:188
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"KhÃng hián bát ká háp thoái nÃo trá khi cà tÃi khoán \"NgÆái chung quanh\""
+
+#: ../src/empathy-accounts.c:192
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "Chán tÃi khoán ban Äáu (vd, gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:194
+msgid "<account-id>"
+msgstr "<tÃi khoán>"
+
+#: ../src/empathy-accounts.c:199
+msgid "- Empathy Accounts"
+msgstr "- TÃi khoán Empathy"
+
+#: ../src/empathy-accounts.c:242
+msgid "Empathy Accounts"
+msgstr "TÃi khoán Empathy"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:70
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "CÃ vÃi thay Äái chÆa lÆu trong tÃi khoán %s cáa bán."
 
 #. 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:76
+#: ../src/empathy-accounts-dialog.c:74
 msgid "Your new account has not been saved yet."
 msgstr "TÃi khoán mái cáa bán chÆa ÄÆác lÆu."
 
-#: ../src/empathy-accounts-dialog.c:381
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "Äang kát náiâ"
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline â %s"
 msgstr "Ngoái tuyán - %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected â %s"
 msgstr "Äát kát nái - %s"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â No Network Connection"
 msgstr "Ngoái tuyán - KhÃng cà kát nái máng"
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr "Tráng thÃi lá"
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:492
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3122,37 +3115,28 @@ msgstr ""
 "cÃi Äát gÃi telepathy-haze và khái Äáng lái phiÃn lÃm viác Äá chuyán Äái tÃi "
 "khoán."
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
 msgstr "Ngoái tuyán - TÃi khoán bá tát"
 
-#: ../src/empathy-accounts-dialog.c:585
-#| msgid "Connection has been refused"
+#: ../src/empathy-accounts-dialog.c:608
 msgid "Edit Connection Parameters"
 msgstr "Sáa tham sá kát nái"
 
-#: ../src/empathy-accounts-dialog.c:750
-msgid "Failed to retrieve your personal information from the server."
-msgstr "Lái nhán thÃng tin cà nhÃn tá mÃy chá."
-
-#: ../src/empathy-accounts-dialog.c:756
-msgid "Go online to edit your personal information."
-msgstr "VÃo trác tuyán Äá sáa thÃng tin cà nhÃn."
-
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:733
 msgid "_Edit Connection Parameters..."
 msgstr "_Sáa tham sá kát nái..."
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1235
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Bán cà thác sá muán gá bá %s khÃng?"
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1239
 msgid "This will not remove your account on the server."
 msgstr "HÃnh Äáng nÃy sá xoà tÃi khoán cáa bán khái mÃy chá."
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1444
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3160,25 +3144,27 @@ msgstr ""
 "Bán Äang chán mát tÃi khoán khÃc. Viác nÃy sá huá toÃn bá\n"
 "nháng thay Äái cáa bán. Bán cà muán tiáp tác khÃng?"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1755
-msgid "_Enable"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1635
+msgid "_Enabled"
 msgstr "_Bát"
 
-#: ../src/empathy-accounts-dialog.c:1756
-msgid "_Disable"
-msgstr "_Tát"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1658
+#, fuzzy
+#| msgid "Real name:"
+msgid "Rename"
+msgstr "TÃn thát:"
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2074
 msgid "_Skip"
 msgstr "_Bá qua"
 
-#: ../src/empathy-accounts-dialog.c:2188
-#| msgid "Connected"
+#: ../src/empathy-accounts-dialog.c:2078
 msgid "_Connect"
 msgstr "_Kát nái"
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2257
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3186,6 +3172,11 @@ msgstr ""
 "Bán Äang ÄÃng cáa sá. Viác nÃy sá huá cÃc thay\n"
 "Äái cáa bán. Bán cà muán tiáp tác khÃng?"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2400
+msgid "Messaging and VoIP Accounts"
+msgstr "TÃi khoán tin nhán và VoIP"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Importâ"
 msgstr "_Nhápâ"
@@ -3203,7 +3194,6 @@ msgstr ""
 "mái giao thác cán dÃng (v.d. IRC, Yahoo)."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-#| msgid "No protocol installed"
 msgid "No protocol backends installed"
 msgstr "ChÆa cÃi Äát mát sau giao thác"
 
@@ -3215,105 +3205,136 @@ msgstr "â TrÃnh gái tin nhán Empathy"
 msgid "Empathy authentication client"
 msgstr "TrÃnh xÃc thác Empathy"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
+#: ../src/empathy.c:432
+msgid "Don't connect on startup"
+msgstr "KhÃng kát nái khi khái cháy"
+
+#: ../src/empathy.c:436
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr ""
+"KhÃng hián thá danh sÃch liÃn lác hoác cÃc háp thoái khÃc khi khái cháy"
+
+#: ../src/empathy.c:452
+msgid "- Empathy IM Client"
+msgstr "â TrÃnh gái tin nhán Empathy"
+
+#: ../src/empathy.c:628
+msgid "Error contacting the Account Manager"
+msgstr "Lái liÃn lác trÃnh quán là tÃi khoán"
+
+#: ../src/empathy.c:630
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Lái liÃn lác trÃnh quán là tÃi khoán Telepathy. Lái lÃ:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-call.c:195
 msgid "- Empathy Audio/Video Client"
 msgstr "- TrÃnh khÃch thoái/video Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
+#: ../src/empathy-call.c:219
 msgid "Empathy Audio/Video Client"
 msgstr "TrÃnh khÃch thoái/video Empathy"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "Äá tÆÆng phán"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "Äá sÃng"
-
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "Gama (Î)"
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s váa mái gái nhÆng bán lái Äang nghe mát cuác gái khÃc."
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "Ãm lÆáng"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
+msgid "i"
+msgstr "i"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "Khung _lá"
+#: ../src/empathy-call-window.c:1485 ../src/empathy-event-manager.c:510
+msgid "Incoming call"
+msgstr "Cuác gái gái Äán"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "Äáu vÃo Ãm thanh"
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Cuác gái video gái Äán tá %s"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "Äáu vÃo video"
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:518
+#: ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Cuác gái gái Äán tá %s"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "VÃng quay sá"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "Tá chái"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "Chi tiát"
+#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+msgstr "Trá lái"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1211
-#: ../src/empathy-call-window.c:1889
+#: ../src/empathy-call-window.c:1862
 #, c-format
 msgid "Call with %s"
 msgstr "Gái cho %s"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
+#: ../src/empathy-call-window.c:2114
 msgid "The IP address as seen by the machine"
 msgstr "Äáa chá IP mÃy nÃy nhÃn tháy"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2116
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Äáa chá IP mà mÃy chá trÃn Internet tháy"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
+#: ../src/empathy-call-window.c:2118
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Äáa chá IP cáa peer mà bÃn kia tháy"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
+#: ../src/empathy-call-window.c:2120
 msgid "The IP address of a relay server"
 msgstr "Äáa chá IP cáa mÃy chuyán tiáp"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
+#: ../src/empathy-call-window.c:2122
 msgid "The IP address of the multicast group"
 msgstr "Äáa chá IP cáa nhÃm multicast"
 
-#: ../src/empathy-streamed-media-window.c:1837
-#: ../src/empathy-streamed-media-window.c:1840
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-#| msgid "Unknown"
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2523 ../src/empathy-call-window.c:2524
+#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
+#: ../src/empathy-call-window.ui.h:26
 msgid "Unknown"
 msgstr "KhÃng rÃ"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
+#: ../src/empathy-call-window.c:2869
+msgid "On hold"
+msgstr "Giá mÃy"
+
+#: ../src/empathy-call-window.c:2871
+msgid "Mute"
+msgstr "CÃm"
+
+#: ../src/empathy-call-window.c:2873
+msgid "Duration"
+msgstr "Khoáng thái gian"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2876
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "ÄÃ kát nái - %d:%02dm"
+msgid "%s â %d:%02dm"
+msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
+#: ../src/empathy-call-window.c:2972
 msgid "Technical Details"
 msgstr "Chi tiát ká thuát"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3011
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3321,8 +3342,7 @@ msgid ""
 msgstr ""
 "Phán mám cáa %s khÃng hiáu bát ká Äánh dáng Ãm thanh nÃo mà mÃy bán há trá"
 
-#: ../src/empathy-streamed-media-window.c:2242
-#: ../src/empathy-call-window.c:3036
+#: ../src/empathy-call-window.c:3016
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3330,8 +3350,7 @@ msgid ""
 msgstr ""
 "Phán mám cáa %s khÃng hiáu bát ká Äánh dáng video nÃo mà mÃy bán há trá"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3022
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3340,27 +3359,23 @@ msgstr ""
 "KhÃng thá táo kát nái Äán %s. CÃ thá mát trong sá cÃc bán nám trong mát máng "
 "khÃng há trá kát nái trác tiáp."
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3028
 msgid "There was a failure on the network"
 msgstr "Lái máng"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3032
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Äánh dáng Ãm thanh cán thiát cho cuác gái nÃy chÆa ÄÆác cÃi Äát trÃn mÃy tÃnh"
 
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3035
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Äánh dáng video cán thiát cho cuác gái nÃy chÆa ÄÆác cÃi Äát trÃn mÃy tÃnh"
 
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
+#: ../src/empathy-call-window.c:3047
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3371,28 +3386,36 @@ msgstr ""
 "<a href=\"%s\">thÃng bÃo lái nÃy</a> và ÄÃnh kÃm thÃng tin tá cáa sá \"TÃm "
 "lái\" trong menu Trá giÃp."
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3056
 msgid "There was a failure in the call engine"
 msgstr "Lái trong há tháng gái"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-call-window.c:3059
 msgid "The end of the stream was reached"
 msgstr "Äán cuái luáng"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3099
 msgid "Can't establish audio stream"
 msgstr "KhÃng thá táo luáng Ãm thanh"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-call-window.c:3109
 msgid "Can't establish video stream"
 msgstr "KhÃng thá táo luáng video"
 
+#: ../src/empathy-call-window.c:3146
+#, c-format
+msgid "Your current balance is %s."
+msgstr "CÃn Äái hián thái là %s."
+
+#: ../src/empathy-call-window.c:3150
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "Rát tiác, bán khÃng Äá tÃn dáng Äá gái."
+
+#: ../src/empathy-call-window.c:3152
+msgid "Top Up"
+msgstr "Náp tián"
+
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "_Gái"
 
@@ -3409,23 +3432,18 @@ msgid "_Settings"
 msgstr "_Thiát láp"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Xem"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "Trá g_iÃp"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "Má_c lác"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_TÃm lái"
 
@@ -3446,12 +3464,10 @@ msgid "Disable camera"
 msgstr "Tát camera"
 
 #: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:2
 msgid "Hang up"
 msgstr "Ngáng cuác gái"
 
 #: ../src/empathy-call-window.ui.h:15
-#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Hang up current call"
 msgstr "Chám dát cuác gái hián tái"
 
@@ -3476,61 +3492,58 @@ msgid "Display the dialpad"
 msgstr "Hián báng bám sá Äián thoái"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "Truyán video"
-
-#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle video transmission"
 msgstr "Bát/tát truyán video"
 
-#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Send Audio"
-msgstr "Truyán tiáng"
-
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-streamed-media-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle audio transmission"
 msgstr "Bát/tát truyán tiáng"
 
-#: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-streamed-media-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:25
 msgid "Encoding Codec:"
 msgstr "Codec mà hoÃ:"
 
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
-msgid "Unknown"
-msgstr "KhÃng rÃ"
-
-#: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:27
 msgid "Decoding Codec:"
 msgstr "Codec giái mÃ:"
 
-#: ../src/empathy-call-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:28
 msgid "Remote Candidate:"
 msgstr "áng cá viÃn á xa:"
 
-#: ../src/empathy-call-window.ui.h:31
-#: ../src/empathy-streamed-media-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:29
 msgid "Local Candidate:"
 msgstr "áng cá viÃn các bá:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "Ãm thanh"
 
-#: ../src/empathy-chat-window.c:289
-#| msgid "Hide the main window."
+#: ../src/empathy-chat.c:106
+msgid "- Empathy Chat Client"
+msgstr "â TrÃnh trà chuyán Empathy"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "TÃn"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "PhÃng"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "Tá Äáng kát nái"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Quán là phÃng Æa thÃch"
+
+#: ../src/empathy-chat-window.c:282
 msgid "Close this window?"
 msgstr "ÄÃng cáa sá nÃy chá?"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:288
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3539,7 +3552,7 @@ msgstr ""
 "ÄÃng cáa sá là rái khái %s. Bán sá khÃng nhán ÄÆác thÃng bÃo mái cho Äán khi "
 "tham gia lái."
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:301
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3549,63 +3562,61 @@ msgid_plural ""
 "further messages until you rejoin them."
 msgstr[0] ""
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:312
 #, c-format
-#| msgid "Level "
 msgid "Leave %s?"
 msgstr "Rái %s chá?"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:314
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr ""
 "Bán sá khÃng nhán ÄÆác thÃng bÃo mái tá phÃng nÃy Äán khi tham gia lái."
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:333
 msgid "Close window"
 msgstr "ÄÃng cáa sá"
 
-#: ../src/empathy-chat-window.c:334
-#| msgid "Level "
+#: ../src/empathy-chat-window.c:333
 msgid "Leave room"
 msgstr "Rái phÃng"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d chÆa Äác)"
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:682
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (và %u náa)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:698
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d chÆa Äác tá ngÆái khÃc)"
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:707
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d chÆa Äác tát cá)"
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:944
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:952
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Äang gái %d tin nhán"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:972
 msgid "Typing a message."
 msgstr "Äang gà tin nhán."
 
@@ -3669,112 +3680,160 @@ msgstr "Dái thá sang _phái"
 msgid "_Detach Tab"
 msgstr "Gá _ra thá"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "TÃn"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Hián dách vá nhát Äánh"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "PhÃng"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- TrÃnh gá lái Empathy"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "Tá Äáng kát nái"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "TrÃnh gá lái Empathy"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "Quán là phÃng Æa thÃch"
+#: ../src/empathy-debug-window.c:1603
+msgid "Save"
+msgstr "LÆu"
+
+#: ../src/empathy-debug-window.c:1663
+msgid "Pastebin link"
+msgstr "LiÃn kát Pastebin"
+
+#: ../src/empathy-debug-window.c:1672
+msgid "Pastebin response"
+msgstr "Phán hái Pastebin"
+
+#: ../src/empathy-debug-window.c:1679
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Dá liáu quà lán cho mát lán gái. Vui lÃng lÆu vÃo táp tin."
+
+#: ../src/empathy-debug-window.c:1860
+msgid "Debug Window"
+msgstr "Cáa sá tÃm lái"
+
+#: ../src/empathy-debug-window.c:1920
+msgid "Send to pastebin"
+msgstr "Gái Äán pastebin"
+
+#: ../src/empathy-debug-window.c:1964
+msgid "Pause"
+msgstr "Tám ngáng"
+
+#: ../src/empathy-debug-window.c:1976
+msgid "Level "
+msgstr "Mác "
+
+#: ../src/empathy-debug-window.c:1995
+msgid "Debug"
+msgstr "TÃm lái"
+
+#: ../src/empathy-debug-window.c:2000
+msgid "Info"
+msgstr "ThÃng tin"
+
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
+msgid "Message"
+msgstr "ThÃng bÃo"
+
+#: ../src/empathy-debug-window.c:2010
+msgid "Warning"
+msgstr "Cánh bÃo"
+
+#: ../src/empathy-debug-window.c:2015
+msgid "Critical"
+msgstr "NghiÃm tráng"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-debug-window.c:2020
+msgid "Error"
+msgstr "Lái"
+
+#: ../src/empathy-debug-window.c:2039
+msgid "Time"
+msgstr "Thái gian"
+
+#: ../src/empathy-debug-window.c:2042
+msgid "Domain"
+msgstr "Mián"
+
+#: ../src/empathy-debug-window.c:2045
+msgid "Category"
+msgstr "PhÃn loái"
+
+#: ../src/empathy-debug-window.c:2048
+msgid "Level"
+msgstr "Mác"
+
+#: ../src/empathy-debug-window.c:2077
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "TrÃnh quán là kát nái ÄÆác chán khÃng há trá tÃm lái tá xa"
+
+#: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "Cuác gái video Äán"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
-msgid "Incoming call"
-msgstr "Cuác gái gái Äán"
-
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:514
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s Äang gái video. Bán cà muán trá lái khÃng?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s Äang gái. Ván cà muán ÄÃp áng khÃng?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Cuác gái gái Äán tá %s"
-
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "_Tá chái"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:551 ../src/empathy-event-manager.c:559
 msgid "_Answer"
 msgstr "T_rá lái"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:559
 msgid "_Answer with video"
 msgstr "_Trá lái cà video"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "Cuác gái video gái Äán tá %s"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:714
 msgid "Room invitation"
 msgstr "Mái vÃo phÃng"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Mái tham gia %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:723
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s mái bán tham gia %s"
 
-#: ../src/empathy-event-manager.c:854
-msgid "_Decline"
-msgstr "_Tá chái"
-
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
+#: ../src/empathy-event-manager.c:736
 msgid "_Join"
 msgstr "_Tham gia"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:762
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ÄÃ mái bán tham gia %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:768
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Bán ÄÆác mái tham gia %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Táp tin gái Äán tá %s"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:224
 msgid "Password required"
 msgstr "Cán mát kháu"
 
-#: ../src/empathy-event-manager.c:1216
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr "%s muán ÄÆác phÃp tháy bán khi trác tuyán"
-
-#: ../src/empathy-event-manager.c:1222
+#: ../src/empathy-event-manager.c:1120
 #, c-format
 msgid ""
 "\n"
@@ -3891,215 +3950,68 @@ msgid "File Transfers"
 msgstr "Truyán táp tin"
 
 #: ../src/empathy-ft-manager.ui.h:2
-msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
-"XÃa bá nháng lán truyán táp tin ÄÃ hoÃn tát, bá ngáng hay bá lái khái danh "
-"sÃch"
-
-#: ../src/empathy-import-dialog.c:76
-#| msgid "Import"
-msgid "_Import"
-msgstr "_Nháp"
-
-#: ../src/empathy-import-dialog.c:88
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"KhÃng tÃm tháy tÃi khoán cà thá nháp vÃo. TrÃnh Empathy hián thái chá há trá "
-"chác nÄng nháp tÃi khoán tá Pidgin."
-
-#: ../src/empathy-import-dialog.c:209
-msgid "Import Accounts"
-msgstr "Nháp tÃi khoán"
-
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
-msgid "Import"
-msgstr "Nháp"
-
-#: ../src/empathy-import-widget.c:325
-msgid "Protocol"
-msgstr "Giao thác"
-
-#: ../src/empathy-import-widget.c:349
-msgid "Source"
-msgstr "Nguán"
-
-#: ../src/empathy-roster-window.c:391
-msgid "Provide Password"
-msgstr "Cung cáp mát kháu"
-
-#: ../src/empathy-roster-window.c:397
-msgid "Disconnect"
-msgstr "Ngát kát nái"
-
-#: ../src/empathy-roster-window.c:657
-msgid "You need to setup an account to see contacts here."
-msgstr "Bán cán thiát láp tÃi khoán Äá xem liÃn lác á ÄÃy."
-
-#: ../src/empathy-roster-window.c:673
-msgid "No match found"
-msgstr "KhÃng tÃm tháy"
-
-#: ../src/empathy-roster-window.c:783
-#, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr ""
-"Rát tiác, khÃng thá dÃng tÃi khoán %s cho Äán khi cáp nhát phán mám %s."
-
-#: ../src/empathy-roster-window.c:849
-msgid "Update software..."
-msgstr "Cáp nhát phán mám..."
-
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
-msgid "Close"
-msgstr "ÄÃng"
-
-#: ../src/empathy-roster-window.c:960
-msgid "Reconnect"
-msgstr "TÃi kát nái"
-
-#: ../src/empathy-roster-window.c:966
-msgid "Edit Account"
-msgstr "Sáa tÃi khoán"
-
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1110
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr "Náp tián %s (%s)"
-
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
-msgstr "Náp tián vÃo tÃi khoán"
-
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr "Náp tián..."
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "LiÃn lác"
-
-#: ../src/empathy-roster-window.c:2150
-msgid "You need to enable one of your accounts to see contacts here."
-msgstr "Bán cán bát mát trong nháng tÃi khoán sau Äá xem liÃn lác á ÄÃy."
-
-#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:2158
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr "Bán cán bát %s Äá xem liÃn lác."
-
-#: ../src/empathy-roster-window.c:2460
-msgid "Contact List"
-msgstr "Danh sÃch LiÃn lác"
-
-#: ../src/empathy-roster-window.ui.h:1
-#| msgid "_Accounts"
-msgid "Account settings"
-msgstr "Thiát láp tÃi khoán"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversationâ"
-msgstr "_Cuác trà chuyán máiâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Callâ"
-msgstr "_Cuác gái máiâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Search for Contactsâ"
-msgstr "_TÃm liÃn lácâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_File Transfers"
-msgstr "Truyán táp tin"
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Offline Contacts"
-msgstr "LiÃn lác ng_oái tuyán"
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Show P_rotocols"
-msgstr "_Hián giao thác"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Credit Balance"
-msgstr "CÃn báng tÃn dáng"
-
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Contacts on a _Map"
-msgstr "LiÃn lác trÃn _bán Äá"
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_TÃi khoán"
-
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Blocked Contacts"
-msgstr "LiÃn lác bá _chán"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "P_references"
-msgstr "_TÃy thÃch"
-
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "Find in Contact _List"
-msgstr "TÃm trong _danh sÃch liÃn lác"
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr ""
+"XÃa bá nháng lán truyán táp tin ÄÃ hoÃn tát, bá ngáng hay bá lái khái danh "
+"sÃch"
 
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "Sort by _Name"
-msgstr "Sáp theo tÃ_n"
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Nháp"
 
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "Sort by _Status"
-msgstr "Sáp theo _tráng thÃi"
+#: ../src/empathy-import-dialog.c:88
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"KhÃng tÃm tháy tÃi khoán cà thá nháp vÃo. TrÃnh Empathy hián thái chá há trá "
+"chác nÄng nháp tÃi khoán tá Pidgin."
 
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "Normal Size With _Avatars"
-msgstr "Cá _thÆáng cà ánh Äái dián"
+#: ../src/empathy-import-dialog.c:209
+msgid "Import Accounts"
+msgstr "Nháp tÃi khoán"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "N_ormal Size"
-msgstr "Cá _thÆáng"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:303
+msgid "Import"
+msgstr "Nháp"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Compact Size"
-msgstr "Cá _gán"
+#: ../src/empathy-import-widget.c:312
+msgid "Protocol"
+msgstr "Giao thác"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Room"
-msgstr "_PhÃng"
+#: ../src/empathy-import-widget.c:336
+msgid "Source"
+msgstr "Nguán"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
-msgid "_Joinâ"
-msgstr "_Tham giaâ"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "Mái ngÆái tham gia"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "Join _Favorites"
-msgstr "_VÃo Æa thÃch"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Chán liÃn lác muán mái trà chuyán:"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "Manage Favorites"
-msgstr "Quán là Æa thÃch"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "Mái"
 
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "PhÃng trà chuyán"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 msgid "Members"
 msgstr "ThÃnh viÃn"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-new-chatroom-dialog.c:410
+#, fuzzy
+#| msgid "Failed to join chatroom"
+msgid "Failed to list rooms"
+msgstr "Lái tham gia phÃng trà chuyán"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4112,39 +4024,43 @@ msgstr ""
 "Cán mát kháu: %s\n"
 "ThÃnh viÃn: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "CÃ"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "KhÃng"
 
-#: ../src/empathy-new-chatroom-dialog.c:668
-msgid "Could not start room listing"
-msgstr "KhÃng thá láy danh sÃch phÃng"
-
-#: ../src/empathy-new-chatroom-dialog.c:678
-msgid "Could not stop room listing"
-msgstr "KhÃng thá ngáng láy danh sÃch phÃng"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.c:784
 msgid "Join Room"
 msgstr "VÃo phÃng"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "HÃy gà tÃn phÃng cán vÃo, hoác chán mát hay nhiáu phÃng trong danh sÃch."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Room:"
 msgstr "_PhÃng:"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#, fuzzy
+#| msgid ""
+#| "Enter the server which hosts the room, or leave it empty if the room is "
+#| "on the current account's server"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"HÃy gà mÃy phác vá cà há trá phÃng, hoác bá tráng náu phÃng khÃng nám trÃn "
+"mÃy phác vá cáa tÃi khoán hián thái."
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4152,180 +4068,220 @@ msgstr ""
 "HÃy gà mÃy phác vá cà há trá phÃng, hoác bá tráng náu phÃng khÃng nám trÃn "
 "mÃy phác vá cáa tÃi khoán hián thái."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "_MÃy phác vá:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Couldn't load room list"
 msgstr "KhÃng thá náp danh sÃch phÃng"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "Danh sÃch phÃng"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "Trá lái"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "Trá lái cuác gái cà video"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "Tá chái"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr "Cháp nhán"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:240
+msgid "Provide"
+msgstr "Cung cáp"
+
+#: ../src/empathy-preferences.c:144
 msgid "Message received"
 msgstr "Nhán ÄÆác tin nhán"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:145
 msgid "Message sent"
 msgstr "Tin nhán ÄÆác gái"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:146
 msgid "New conversation"
 msgstr "Cuác trà chuyán mái"
 
-#: ../src/empathy-preferences.c:169
-#| msgid "Contact goes online"
+#: ../src/empathy-preferences.c:147
 msgid "Contact comes online"
 msgstr "LiÃn lác mái trác tuyán"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:148
 msgid "Contact goes offline"
 msgstr "LiÃn lác mái ngoái tuyán"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:149
 msgid "Account connected"
 msgstr "TÃi khoán ÄÃ kát nái"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:150
 msgid "Account disconnected"
 msgstr "TÃi khoán bá ngát kát nái"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:387
 msgid "Language"
 msgstr "NgÃn ngá"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:638
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:645
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:651
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ãi Romeo, Romeo, tái sao chÃng lái là Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:655
 msgid "Deny thy father and refuse thy name;"
 msgstr "ChÃng hÃy khÆác tá cha và vát bá tÃn há áy Äi"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:658
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Náu khÃng thá thà chÃng hÃy thá yÃu em"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:749
+#: ../src/empathy-preferences.c:661
 msgid "And I'll no longer be a Capulet."
 msgstr "Và em sá khÃng cÃn là ngÆái nhà Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:664
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Ta nÃn nghe thÃm hay ta nÃn má lái?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:755
+#: ../src/empathy-preferences.c:667
 msgid "Juliet has disconnected"
 msgstr "Juliet ÄÃ ngát kát nái"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1033
 msgid "Preferences"
 msgstr "TÃy thÃch"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Show _smileys as images"
-msgstr "HIán _hÃnh cÆái dáng ánh"
-
 #: ../src/empathy-preferences.ui.h:2
-msgid "Show contact _list in rooms"
-msgstr "_Hián danh sÃch liÃn lác trong phÃng"
+#, fuzzy
+#| msgid "Show contact groups"
+msgid "Show groups"
+msgstr "Hián nhÃm liÃn lác"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "Dián máo"
+#, fuzzy
+#| msgid "Show the accounts dialog"
+msgid "Show account balances"
+msgstr "Hián háp thoái tÃi khoán"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2141
+msgid "Contact List"
+msgstr "Danh sÃch LiÃn lác"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "Bát Äáu tÃn gáu trong:"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "new ta_bs"
 msgstr "_thá mái"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "new _windows"
 msgstr "_cáa sá mái"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Display incoming events in the notification area"
-msgstr "Hián sá kián Äán trong vÃng tráng thÃi"
-
 #: ../src/empathy-preferences.ui.h:8
-msgid "_Automatically connect on startup"
-msgstr "Tá Äáng kát nái khi khái _cháy"
+msgid "Show _smileys as images"
+msgstr "HIán _hÃnh cÆái dáng ánh"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Show contact _list in rooms"
+msgstr "_Hián danh sÃch liÃn lác trong phÃng"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Log conversations"
 msgstr "Ghi lái cuác trà chuyán"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
+msgid "Display incoming events in the notification area"
+msgstr "Hián sá kián Äán trong vÃng tráng thÃi"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "_Automatically connect on startup"
+msgstr "Tá Äáng kát nái khi khái _cháy"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Behavior"
 msgstr "áng xá"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "Chung"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
 msgid "_Enable bubble notifications"
 msgstr "_Bát thÃng bÃo trong bÃng"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:17
 msgid "Disable notifications when _away or busy"
 msgstr "Tát thÃng bÃo khi váng mát h_ay bán"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ThÃng bÃo khi _cáa sá trà chuyán khÃng cà tiÃu Äiám"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Enable notifications when a contact comes online"
 msgstr "Bát thÃng bÃo khi liÃn lác trác tuyán"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Enable notifications when a contact goes offline"
 msgstr "Bát thÃng bÃo khi liÃn lác ngoái tuyán"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Notifications"
 msgstr "ThÃng bÃo"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
 msgid "_Enable sound notifications"
 msgstr "_PhÃt Ãm thÃng bÃo"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Disable sounds when _away or busy"
 msgstr "Tát phÃt Ãm khi váng mát h_ay bán"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Play sound for events"
 msgstr "PhÃt Ãm vá sá kián"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
 msgid "Sounds"
 msgstr "Ãm thanh"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
 msgid "Use _echo cancellation to improve call quality"
 msgstr "DÃng _khá tiáng vang Äá cái thián chát lÆáng cuác gái"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4336,391 +4292,453 @@ msgstr ""
 "vái mát sá mÃy. Náu bán hoác ngÆái bÃn kia nghe tiáng án lá hoác giát các "
 "khi gái, thá tát khá tiáng vang và gái lái."
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Publish location to my contacts"
-msgstr "_CÃng bá vá trà cho bán bà tÃi"
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Publish location to my contacts"
+msgstr "_CÃng bá vá trà cho bán bà tÃi"
+
+#: ../src/empathy-preferences.ui.h:31
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Giám Äá chÃnh xÃc nghÄa là chá cÃng bá vá trà cáa bán Äán mác thÃnh phá, "
+"bang và quác gia. Toá Äá GPS cà thá chÃnh xÃc Äán 1 chá sá."
+
+#. 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:33
+msgid "_Reduce location accuracy"
+msgstr "_Giám Äá chÃnh xÃc vá trÃ"
+
+#: ../src/empathy-preferences.ui.h:34
+msgid "Privacy"
+msgstr "RiÃng tÆ"
+
+#: ../src/empathy-preferences.ui.h:35
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Cellphone"
+msgstr "Äián thoái _di ÄÃng"
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Máng (IP, Wi-Fi)"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Location sources:"
+msgstr "Nguán vá trÃ:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Danh sÃch ngÃn ngá nÃy phán Ãnh chá nháng ngÃn ngá cho mà bán Äà cÃi Äát tá "
+"Äián."
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Enable spell checking for languages:"
+msgstr "Bát kiám tra chÃnh tá cho ngÃn ngá:"
+
+#: ../src/empathy-preferences.ui.h:42
+msgid "Spell Checking"
+msgstr "Kiám tra chÃnh tá"
+
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
+msgstr "_Sác thÃi trà chuyán: "
+
+#: ../src/empathy-preferences.ui.h:44
+msgid "Variant:"
+msgstr "Bián thá:"
+
+#: ../src/empathy-preferences.ui.h:45
+msgid "Themes"
+msgstr "Sác thÃi"
+
+#: ../src/empathy-roster-window.c:241
+msgid "Provide Password"
+msgstr "Cung cáp mát kháu"
+
+#: ../src/empathy-roster-window.c:247
+msgid "Disconnect"
+msgstr "Ngát kát nái"
+
+#: ../src/empathy-roster-window.c:418
+msgid "You need to setup an account to see contacts here."
+msgstr "Bán cán thiát láp tÃi khoán Äá xem liÃn lác á ÄÃy."
+
+#: ../src/empathy-roster-window.c:505
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr ""
+"Rát tiác, khÃng thá dÃng tÃi khoán %s cho Äán khi cáp nhát phán mám %s."
+
+#: ../src/empathy-roster-window.c:571
+msgid "Update software..."
+msgstr "Cáp nhát phán mám..."
+
+#: ../src/empathy-roster-window.c:577 ../src/empathy-roster-window.c:694
+msgid "Close"
+msgstr "ÄÃng"
+
+#: ../src/empathy-roster-window.c:682
+msgid "Reconnect"
+msgstr "TÃi kát nái"
+
+#: ../src/empathy-roster-window.c:688
+msgid "Edit Account"
+msgstr "Sáa tÃi khoán"
+
+#: ../src/empathy-roster-window.c:868
+#, fuzzy
+#| msgid "Top up account credit"
+msgid "Top up account"
+msgstr "Náp tián vÃo tÃi khoán"
+
+#: ../src/empathy-roster-window.c:1530
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Bán cán bát mát trong nháng tÃi khoán sau Äá xem liÃn lác á ÄÃy."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1538
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Bán cán bát %s Äá xem liÃn lác."
+
+#: ../src/empathy-roster-window.c:1595
+msgid "No match found"
+msgstr "KhÃng tÃm tháy"
+
+#: ../src/empathy-roster-window.c:1599
+#, fuzzy
+#| msgid "Show offline contacts"
+msgid "No online contacts"
+msgstr "Hián liÃn lác ngoái tuyán"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "Cuác _nÃi chuyán mái..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "_Gái Äián..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#, fuzzy
+#| msgid "Contact"
+msgid "Contacts"
+msgstr "LiÃn lác"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+#, fuzzy
+#| msgid "_Add Contact"
+msgid "_Add Contacts..."
+msgstr "ThÃ_m liÃn lác"
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+#, fuzzy
+#| msgid "_Search for Contactsâ"
+msgid "_Search for Contacts..."
+msgstr "_TÃm liÃn lácâ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "LiÃn lác bá _chán"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Giám Äá chÃnh xÃc nghÄa là chá cÃng bá vá trà cáa bán Äán mác thÃnh phá, "
-"bang và quác gia. Toá Äá GPS cà thá chÃnh xÃc Äán 1 chá sá."
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#, fuzzy
+#| msgid "_Room"
+msgid "_Rooms"
+msgstr "_PhÃng"
 
-#. 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:29
-msgid "_Reduce location accuracy"
-msgstr "_Giám Äá chÃnh xÃc vá trÃ"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "_Tham gia..."
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Privacy"
-msgstr "RiÃng tÆ"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "_VÃo Æa thÃch"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_GPS"
-msgstr "_GPS"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+#, fuzzy
+#| msgid "Manage Favorites"
+msgid "_Manage Favorites"
+msgstr "Quán là Æa thÃch"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Cellphone"
-msgstr "Äián thoái _di ÄÃng"
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "Truyán táp tin"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Máng (IP, Wi-Fi)"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_TÃi khoán"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "Location sources:"
-msgstr "Nguán vá trÃ:"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "_TÃy thÃch"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Danh sÃch ngÃn ngá nÃy phán Ãnh chá nháng ngÃn ngá cho mà bán Äà cÃi Äát tá "
-"Äián."
+#: ../src/empathy-roster-window-menubar.ui.h:15
+#, fuzzy
+#| msgid "_Help"
+msgid "Help"
+msgstr "Trá g_iÃp"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "Enable spell checking for languages:"
-msgstr "Bát kiám tra chÃnh tá cho ngÃn ngá:"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+#, fuzzy
+#| msgid "Empathy"
+msgid "About Empathy"
+msgstr "Empathy"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "Spell Checking"
-msgstr "Kiám tra chÃnh tá"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "T_hoÃt"
 
-#: ../src/empathy-preferences.ui.h:39
-msgid "Chat Th_eme:"
-msgstr "_Sác thÃi trà chuyán: "
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Thiát láp tÃi khoán"
 
-#: ../src/empathy-preferences.ui.h:40
-msgid "Variant:"
-msgstr "Bián thá:"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_Cuác trà chuyán máiâ"
 
-#: ../src/empathy-preferences.ui.h:41
-msgid "Themes"
-msgstr "Sác thÃi"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "_Cuác gái máiâ"
 
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Tráng thÃi"
 
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "T_hoÃt"
-
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "Gái lái"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "_Video"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:210
+#, fuzzy
+#| msgid "Enter your account details"
+msgid "Please enter your account details"
+msgstr "Äián chi tiát tÃi khoán"
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "Tát video"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, fuzzy, c-format
+#| msgid "Loading account information"
+msgid "Edit %s account options"
+msgstr "Äang náp thÃng tin liÃn lác"
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "Xem trÆác"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "Quán là tÃi khoán tin nhán và VoIP"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "Bát video"
+#~ msgid "Show avatars"
+#~ msgstr "Hián ánh Äái dián"
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "Gái lái lán náa"
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr ""
+#~ "Bát/tát hián thá ánh riÃng cho liÃn lác trong danh sÃch liÃn lác và cáa "
+#~ "sá trà chuyán."
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "Tát mÃy quay"
+#~ msgid "Show protocols"
+#~ msgstr "Hián giao thác"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "Tát mÃy quay và ngáng truyán video"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "Bát/tát hián thá giao thác trong danh sÃch liÃn lác."
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "Xem trÆác"
+#~ msgid "Compact contact list"
+#~ msgstr "Co lái danh sÃch liÃn há"
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "Bát mÃy quay nhÆng khÃng truyán video"
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "Bát/tát danh sÃch liÃn lác á chá Äá tÃm gán."
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "Bát mÃy quay"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "TiÃu chuán sáp xáp danh sÃch liÃn lác"
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "Bát mÃy quay và truyán video"
+#~| 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 the contact list by state."
+#~ msgid ""
+#~ "Which criterion to use when sorting the contact list. Default is to sort "
+#~ "by the contact's state with the value \"state\". A value of \"name\" will "
+#~ "sort the contact list by name."
+#~ msgstr ""
+#~ "TiÃu chuán nÃo cán dÃng khi sáp xáp danh sÃch liÃn lác. Mác Äánh là sáp "
+#~ "theo \"state\" (tráng thÃi).  Già trá là \"name\" (tÃn) sáp thá tá theo "
+#~ "tÃn."
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "Xem bán Äá danh sÃch"
+#~ msgid "Network:"
+#~ msgstr "Máng:"
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "LÆu"
+#~ msgid "Password:"
+#~ msgstr "Mát kháu:"
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "LiÃn kát Pastebin"
+#~ msgid "Port:"
+#~ msgstr "Cáng:"
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr "Phán hái Pastebin"
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "\"%s\" khÃng phái là ID háp lá"
 
-#: ../src/empathy-debug-window.c:1680
-#, c-format
-#| msgid "%s:"
-msgid "%s"
-msgstr "%s"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %B %d %Y"
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr "Dá liáu quà lán cho mát lán gái. Vui lÃng lÆu vÃo táp tin."
+#~ msgid "_Block User"
+#~ msgstr "_Chán ngÆái dÃng"
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "Cáa sá tÃm lái"
+#~ msgid "Decide _Later"
+#~ msgstr "Quyát Äánh _sau nÃy"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "Gái Äán pastebin"
+#~ msgid "Classic"
+#~ msgstr "Cá Äián"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "Tám ngáng"
+#~ msgid "Simple"
+#~ msgstr "ÄÆn gián"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "Mác "
+#~ msgid "Clean"
+#~ msgstr "Dán"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "TÃm lái"
+#~ msgid "Blue"
+#~ msgstr "Xanh"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "ThÃng tin"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "Lái nhán thÃng tin cà nhÃn tá mÃy chá."
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "ThÃng bÃo"
+#~ msgid "_Enable"
+#~ msgstr "_Bát"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "Cánh bÃo"
+#~ msgid "_Disable"
+#~ msgstr "_Tát"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "NghiÃm tráng"
+#~ msgid "Contrast"
+#~ msgstr "Äá tÆÆng phán"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "Lái"
+#~ msgid "Brightness"
+#~ msgstr "Äá sÃng"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "Thái gian"
+#~ msgid "Gamma"
+#~ msgstr "Gama (Î)"
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "Mián"
+#~ msgid "Volume"
+#~ msgstr "Ãm lÆáng"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "PhÃn loái"
+#~ msgid "_Sidebar"
+#~ msgstr "Khung _lá"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "Mác"
+#~ msgid "Audio input"
+#~ msgstr "Äáu vÃo Ãm thanh"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "TrÃnh quán là kát nái ÄÆác chán khÃng há trá tÃm lái tá xa"
+#~ msgid "Video input"
+#~ msgstr "Äáu vÃo video"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
-msgid "Invite Participant"
-msgstr "Mái ngÆái tham gia"
+#~ msgid "Dialpad"
+#~ msgstr "VÃng quay sá"
 
-#: ../src/empathy-invite-participant-dialog.c:203
-msgid "Choose a contact to invite into the conversation:"
-msgstr "Chán liÃn lác muán mái trà chuyán:"
+#~ msgid "Details"
+#~ msgstr "Chi tiát"
 
-#: ../src/empathy-invite-participant-dialog.c:226
-msgid "Invite"
-msgstr "Mái"
+#~| msgid "Unknown"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "KhÃng rÃ"
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"KhÃng hián bát ká háp thoái nÃo; thác hián bát ká cÃng viác nÃo (vd, nháp) "
-"và thoÃt"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "ÄÃ kát nái - %d:%02dm"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
-"KhÃng hián bát ká háp thoái nÃo trá khi cà tÃi khoán \"NgÆái chung quanh\""
+#~ msgid "Send Video"
+#~ msgstr "Truyán video"
 
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Chán tÃi khoán ban Äáu (vd, gabble/jabber/foo_40example_2eorg0)"
+#~ msgid "Send Audio"
+#~ msgstr "Truyán tiáng"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<tÃi khoán>"
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "Náp tián %s (%s)"
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- TÃi khoán Empathy"
+#~ msgid "Top Up..."
+#~ msgstr "Náp tián..."
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "TÃi khoán Empathy"
+#~ msgid "_Offline Contacts"
+#~ msgstr "LiÃn lác ng_oái tuyán"
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "Hián dách vá nhát Äánh"
+#~ msgid "Show P_rotocols"
+#~ msgstr "_Hián giao thác"
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- TrÃnh gá lái Empathy"
+#~ msgid "Credit Balance"
+#~ msgstr "CÃn báng tÃn dáng"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "TrÃnh gá lái Empathy"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "LiÃn lác trÃn _bán Äá"
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr "â TrÃnh trà chuyán Empathy"
+#~ msgid "Find in Contact _List"
+#~ msgstr "TÃm trong _danh sÃch liÃn lác"
 
-#: ../src/empathy-notifications-approver.c:189
-msgid "Respond"
-msgstr "Trá lái"
+#~ msgid "Sort by _Name"
+#~ msgstr "Sáp theo tÃ_n"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
-msgid "Reject"
-msgstr "Tá chái"
+#~ msgid "Sort by _Status"
+#~ msgstr "Sáp theo _tráng thÃi"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
-msgid "Answer"
-msgstr "Trá lái"
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "Cá _thÆáng cà ánh Äái dián"
 
-#: ../src/empathy-notifications-approver.c:213
-msgid "Answer with video"
-msgstr "Trá lái cuác gái cà video"
+#~ msgid "N_ormal Size"
+#~ msgstr "Cá _thÆáng"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
-msgid "Decline"
-msgstr "Tá chái"
+#~ msgid "_Compact Size"
+#~ msgstr "Cá _gán"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
-msgid "Accept"
-msgstr "Cháp nhán"
+#~ msgid "_Joinâ"
+#~ msgstr "_Tham giaâ"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:246
-msgid "Provide"
-msgstr "Cung cáp"
+#~ msgid "Could not start room listing"
+#~ msgstr "KhÃng thá láy danh sÃch phÃng"
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s váa mái gái nhÆng bán lái Äang nghe mát cuác gái khÃc."
+#~ msgid "Could not stop room listing"
+#~ msgstr "KhÃng thá ngáng láy danh sÃch phÃng"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
-msgid "i"
-msgstr "i"
+#~ msgid "Appearance"
+#~ msgstr "Dián máo"
 
-#: ../src/empathy-call-window.c:2888
-msgid "On hold"
-msgstr "Giá mÃy"
+#~ msgid "Redial"
+#~ msgstr "Gái lái"
 
-#: ../src/empathy-call-window.c:2891
-msgid "Mute"
-msgstr "CÃm"
+#~ msgid "V_ideo"
+#~ msgstr "_Video"
 
-#: ../src/empathy-call-window.c:2893
-msgid "Duration"
-msgstr "Khoáng thái gian"
+#~ msgid "Video Off"
+#~ msgstr "Tát video"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s â %d:%02dm"
+#~ msgid "Video Preview"
+#~ msgstr "Xem trÆác"
 
-#: ../src/empathy-call-window.c:3166
-#, c-format
-msgid "Your current balance is %s."
-msgstr "CÃn Äái hián thái là %s."
+#~ msgid "Video On"
+#~ msgstr "Bát video"
 
-#: ../src/empathy-call-window.c:3170
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "Rát tiác, bán khÃng Äá tÃn dáng Äá gái."
+#~ msgid "Call the contact again"
+#~ msgstr "Gái lái lán náa"
 
-#: ../src/empathy-call-window.c:3172
-#| msgid "Top Up..."
-msgid "Top Up"
-msgstr "Náp tián"
+#~ msgid "Camera Off"
+#~ msgstr "Tát mÃy quay"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "_PhÃn biát hoa thÆáng"
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "Tát mÃy quay và ngáng truyán video"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Bán cà nháng loái tÃi khoán tin nhanh/trà chuyán nÃo?"
+#~ msgid "Preview"
+#~ msgstr "Xem trÆác"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-#| msgid "New account"
-msgid "Adding new account"
-msgstr "ThÃm tÃi khoán mái"
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "Bát mÃy quay nhÆng khÃng truyán video"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "NgÆái chung quanh"
+#~ msgid "Camera On"
+#~ msgstr "Bát mÃy quay"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
-#| msgid ""
-#| "Empathy can automatically discover and chat with the people connected on "
-#| "the same network as you. If you want to use this feature, please check "
-#| "that the details below are correct. You can easily change these details "
-#| "later or disable this feature by using the 'Accounts' dialog"
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct."
-msgstr ""
-"Empathy cà thá tá khÃm phà và cho phÃp trà chuyán vái ngÆái dÃng kát nái "
-"trÃn cÃng máng nái bá. Náu bán muán dÃng tÃnh nÄng nÃy, hÃy báo Äám thÃng "
-"tin bÃn dÆái là ÄÃng."
+#~ msgid "Enable camera and send video"
+#~ msgstr "Bát mÃy quay và truyán video"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit â Accounts</span> in the Contact List."
-msgstr ""
-"Bán cà thá thay Äái chi tiát sau nÃy, hoác tát tÃnh nÄng nÃy báng cÃch chán "
-"<span style=\"italic\">Sáa â TÃi khoán</span> trong Danh sÃch liÃn lác."
+#~ msgid "Contact Map View"
+#~ msgstr "Xem bán Äá danh sÃch"
 
 #~ msgid "Call volume"
 #~ msgstr "Ãm lÆáng cuác gái"
@@ -4865,9 +4883,6 @@ msgstr ""
 #~ msgid "Do you have any other chat accounts you want to set up?"
 #~ msgstr "Bán cÃn tÃi khoán nÃo khÃc muán thiát láp khÃng?"
 
-#~ msgid "Enter your account details"
-#~ msgstr "Äián chi tiát tÃi khoán"
-
 #~ msgid "What kind of chat account do you want to create?"
 #~ msgstr "Bán muán táo loái tÃi khoán nÃo?"
 
@@ -4994,9 +5009,6 @@ msgstr ""
 #~ msgid "All"
 #~ msgstr "Tát cá"
 
-#~ msgid "_Enabled"
-#~ msgstr "_Bát"
-
 #~ msgid "Date"
 #~ msgstr "NgÃy"
 
@@ -5094,10 +5106,6 @@ msgstr ""
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "Lái tÃi kát nái cuác trà chuyán nÃy"
 
-#~| msgid "_Invite to chatroom"
-#~ msgid "Failed to join chatroom"
-#~ msgstr "Lái tham gia phÃng trà chuyán"
-
 #~| msgid "<b>Contact</b>"
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>Vá trÃ</b>"
@@ -5117,9 +5125,6 @@ msgstr ""
 #~ msgid "Select a destination"
 #~ msgstr "Chán ÄÃch"
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Hián háp thoái tÃi khoán"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "ThÃng bÃo lái là <span style=\"italic\">%s</span>"
 
@@ -5156,16 +5161,6 @@ msgstr ""
 #~ msgid "%s account"
 #~ msgstr "TÃi khoán %s"
 
-#~ msgid "New _Call..."
-#~ msgstr "_Gái Äián..."
-
-#~| msgid "_Join"
-#~ msgid "_Join..."
-#~ msgstr "_Tham gia..."
-
-#~ msgid "_New Conversation..."
-#~ msgstr "Cuác _nÃi chuyán mái..."
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "KhÃng thá khái cháy áng dáng cho dách vá %s: %s"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]